Use our own versions

diff --git a/bootstrap/Makefile b/bootstrap/Makefile
index 9480df89a6645925524772db86680426e46d7bec..9d73663a6b5ab38a773da93d68ac43f9facb54e0 100644 (file)
--- a/bootstrap/Makefile
+++ b/bootstrap/Makefile
@@ -51,17 +51,20 @@ clean:
        make -C org.argeo.tp.build clean
 
 distclean:
-       rm -f sdk.mk
-       rm -rf ./output
+       $(RM) -f sdk.mk
+       $(RM) -rf ./output
 
 clean-sources:
        $(RM) -rf $(ECJ_BASE)
        $(RM) -rf $(BNDLIB_BASE)
-       rm -rf org.argeo.tp.build/biz.aQute.bndlib/src
+       $(RM) -rf org.argeo.tp.build/biz.aQute.bndlib/src
        
 deb-source: distclean clean-sources bootstrap-prepare-sources
        debuild --no-sign -S
-       rm -f debian/files
+       $(RM) -f debian/files
+       $(RM) -rf $(ECJ_BASE)
+       $(RM) -rf $(BNDLIB_BASE)
+       $(RM) -rf org.argeo.tp.build/biz.aQute.bndlib/src
 
 bootstrap-prepare-sources: bootstrap-download-sources
        ## ECJ
@@ -119,8 +122,8 @@ bootstrap-prepare-sources: bootstrap-download-sources
        $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/annotation/spi
        $(RM) -rf $(BNDLIB_SRC)/aQute/bnd/junit
 
-       mkdir -p org.argeo.tp.build/biz.aQute.bndlib/src
-       cp -r ../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* org.argeo.tp.build/biz.aQute.bndlib/src
+       #mkdir -p org.argeo.tp.build/biz.aQute.bndlib/src
+       #cp -r ../rebuild/org.argeo.tp/org.argeo.ext.slf4j/src/* org.argeo.tp.build/biz.aQute.bndlib/src
        
        # make sure directory is clean
        $(RM) -rf ./output

diff --git a/bootstrap/debian/changelog b/bootstrap/debian/changelog
index 2dc18f548d69986fa253e0fea2d37bbafcd7be97..826177f78d4f397e5cfac0f603192a794da603d0 100644 (file)
--- a/bootstrap/debian/changelog
+++ b/bootstrap/debian/changelog
@@ -1,5 +1,5 @@
-argeo-tp-build (4.26.0.0) unstable; urgency=medium
+argeo-tp-build (2.3.5~4.26) unstable; urgency=medium
 
-  * Initial release
+  * Initial release based on Eclipse release 4.46 (ECJ 3.32)
 
  -- Mathieu Baudier <mbaudier@argeo.org>  Fri, 10 Mar 2023 08:27:26 +0100