[ecj] 02/145: Import Debian changes 3.0.1-3

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit c4739982eee743bfdae57166d2a254034718473c
Author: Matthias Klose <doko at debian.org>
Date:   Wed Jun 1 23:24:48 2005 +0200

    Import Debian changes 3.0.1-3
    
    ecj-bootstrap (3.0.1-3) experimental; urgency=low
    
      * Synchronize.
    
    ecj-bootstrap (3.0.1-1ubuntu6) breezy; urgency=low
    
      * Now provides 'ecj' which will also be provided by the future
        eclipse-ecj package built from full Eclipse source.
      * Removed universe/ from Section.
      * Now refering to libgcj-4.0.jar instead of 4.0.0.jar to handle
        changing versions better.
---
 debian/changelog | 16 ++++++++++++++++
 debian/control   |  1 +
 debian/rules     | 15 ++++++++-------
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38a8023..dc0a2d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+ecj-bootstrap (3.0.1-3) experimental; urgency=low
+
+  * Synchronize.
+
+ -- Matthias Klose <doko at debian.org>  Wed,  1 Jun 2005 23:24:48 +0200
+
+ecj-bootstrap (3.0.1-1ubuntu6) breezy; urgency=low
+
+  * Now provides 'ecj' which will also be provided by the future
+    eclipse-ecj package built from full Eclipse source.
+  * Removed universe/ from Section.
+  * Now refering to libgcj-4.0.jar instead of 4.0.0.jar to handle
+    changing versions better.
+
+ -- Jerry Haltom <wasabi at larvalstage.net>  Wed,  1 Jun 2005 14:12:16 -0500
+
 ecj-bootstrap (3.0.1-2) experimental; urgency=low
 
   * Upload to experimental, set maintainer to Debian Java Matainers,
diff --git a/debian/control b/debian/control
index 9e5ba9f..392da28 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Package: ecj-bootstrap
 Architecture: all
 Depends: gij-4.0 (>= 4.0.0-7), libgcj6-common
 Suggests: libant1.6-java
+Provides: ecj
 Conflicts: ecj
 Description: bootstrap version of the Eclipse Java compiler
  This package provides a bootstrap version of the Eclipse JDT compiler which is
diff --git a/debian/rules b/debian/rules
index 4937ea0..4c39c6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-gcc_version = 4.0.1
+gcc_version = 4.0
+ant_version = 1.6
 
 build/ecj-bootstrap:: build/stamp
 build/stamp:
@@ -12,8 +13,8 @@ build/stamp:
 	for i in compiler batch antadapter; do \
 	    mkdir build/bin/$$i; \
 	    cp -r src/org.eclipse.jdt.core/$$i/* build/bin/$$i; \
-	    /usr/bin/gcj-4.0 -d build/bin/$$i -C \
-	        -I/usr/share/ant1.6/lib/ant.jar \
+	    /usr/bin/gcj-$(gcc_version) -d build/bin/$$i -C \
+	        -I/usr/share/ant$(ant_version)/lib/ant.jar \
 		-Ibuild/bin/compiler -Ibuild/bin/batch \
 	        $$(find build/bin/$$i -name '*.java'); \
 	done
@@ -34,8 +35,8 @@ build/stamp:
 	for i in compiler batch antadapter; do \
 	    mkdir build/bin/$$i; \
 	    cp -r src/org.eclipse.jdt.core/$$i/* build/bin/$$i; \
-	    /usr/bin/gij-4.0 \
-	        -classpath build/bootstrap/ecj.jar:/usr/share/ant1.6/lib/ant.jar \
+	    /usr/bin/gij-$(gcc_version) \
+	        -classpath build/bootstrap/ecj.jar:/usr/share/ant$(ant_version)/lib/ant.jar \
 	        org.eclipse.jdt.internal.compiler.batch.Main \
 	        -bootclasspath /usr/share/java/libgcj-$(gcc_version).jar \
 	        build/bin/$$i; \
@@ -51,11 +52,11 @@ build/stamp:
 	rm -rf build/bin
 
 
-	#/usr/bin/gcj-4.0 \
+	#/usr/bin/gcj-$(gcc_version) \
 	#    -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
 	#    -o build/dist/ecj.jar.so build/dist/ecj.jar
 
-	#/usr/bin/gcj-4.0 \
+	#/usr/bin/gcj-$(gcc_version) \
 	#    -Wl,-Bsymbolic -fPIC -fjni \
 	#    --main=org.eclipse.jdt.internal.compiler.batch.Main \
 	#    -o build/dist/ecj build/dist/ecj.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git