[ecj] 18/145: Import Debian changes 3.2-2

[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 d4dda2262610e94383f7dc6009701d4f3b3d2aae
Author: Matthias Klose <doko at debian.org>
Date:   Sun Aug 13 13:01:45 2006 +0200

    Import Debian changes 3.2-2
    
    ecj-bootstrap (3.2-2) experimental; urgency=low
    
      * Build using the gcj backport from experimental.
      * Do not build the binary ecj.
---
 debian/changelog                                     |  7 +++++++
 debian/control                                       |  2 +-
 debian/ecj-bootstrap-gcj.install                     |  1 -
 ...rap-gcj.install => ecj-bootstrap-gcj.install.old} |  0
 debian/rules                                         | 20 ++++++++++----------
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e63b820..8ca0c24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ecj-bootstrap (3.2-2) experimental; urgency=low
+
+  * Build using the gcj backport from experimental.
+  * Do not build the binary ecj.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 13 Aug 2006 13:01:45 +0200
+
 ecj-bootstrap (3.2-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index f24b4ba..7a93918 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
-Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.1 (>= 4.1.0), fastjar, ant, dpkg (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.1 (>= 4.1.1-11j1), fastjar, ant, dpkg (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: ecj-bootstrap
diff --git a/debian/ecj-bootstrap-gcj.install b/debian/ecj-bootstrap-gcj.install
index b67c5f2..0145bdb 100644
--- a/debian/ecj-bootstrap-gcj.install
+++ b/debian/ecj-bootstrap-gcj.install
@@ -1,3 +1,2 @@
-debian/tmp/usr/bin/ecj-bootstrap-gcj
 debian/tmp/usr/lib/java/ecj.jar.so
 debian/tmp/usr/share/gcj-*
diff --git a/debian/ecj-bootstrap-gcj.install b/debian/ecj-bootstrap-gcj.install.old
similarity index 100%
copy from debian/ecj-bootstrap-gcj.install
copy to debian/ecj-bootstrap-gcj.install.old
diff --git a/debian/rules b/debian/rules
index 3e6a5c7..fa2a24d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,14 +91,14 @@ endif
 	rm -rf build/bin
 
 ifeq ($(with_native),yes)
-	$(GCJ) \
+	$(GCJ) -v \
 	    -O2 -g -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
 	    -o build/dist/ecj.jar.so build/dist/ecj.jar
 
-	$(GCJ) \
-	    -O2 -g -Wl,-Bsymbolic -fPIC -fjni -findirect-dispatch \
-	    --main=org.eclipse.jdt.internal.compiler.batch.Main \
-	    -o build/dist/ecj-bootstrap-gcj build/dist/ecj.jar
+#	$(GCJ) -v \
+#	    -O2 -g -Wl,-Bsymbolic -fPIC -fjni -findirect-dispatch \
+#	    --main=org.eclipse.jdt.internal.compiler.batch.Main \
+#	    -o build/dist/ecj-bootstrap-gcj build/dist/ecj.jar
 endif
 
 	touch build/stamp
@@ -115,9 +115,9 @@ ifeq ($(with_native),yes)
 	mkdir -p debian/tmp/usr/lib/java
 	install -m 644 build/dist/ecj.jar.so debian/tmp/usr/lib/java
 
-	# Native GCJ version.
-	mkdir -p debian/tmp/usr/bin
-	install -m 755 build/dist/ecj-bootstrap-gcj debian/tmp/usr/bin/
+#	# Native GCJ version.
+#	mkdir -p debian/tmp/usr/bin
+#	install -m 755 build/dist/ecj-bootstrap-gcj debian/tmp/usr/bin/
 
 	mkdir -p debian/tmp/usr/share/gcj-$(gcc_version)/classmap.d
 	gcj-dbtool-$(gcc_version) -n debian/tmp/usr/share/gcj-$(gcc_version)/classmap.d/ecj-bootstrap.db
@@ -133,8 +133,8 @@ endif
 
 install/ecj-bootstrap:: install-ecj-bootstrap
 install/ecj-bootstrap-gcj:: install-ecj-bootstrap
-	mkdir -p debian/ecj-bootstrap-gcj/usr/share/man/man1
-	ln -sf ecj-bootstrap.1.gz debian/ecj-bootstrap-gcj/usr/share/man/man1/ecj-bootstrap-gcj.1.gz
+#	mkdir -p debian/ecj-bootstrap-gcj/usr/share/man/man1
+#	ln -sf ecj-bootstrap.1.gz debian/ecj-bootstrap-gcj/usr/share/man/man1/ecj-bootstrap-gcj.1.gz
 
 
 clean::

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