[ecj] 19/145: Import Debian changes 3.2-3

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Mar 27 23:11:23 BST 2018 

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

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

commit 68f73e0d328d25a66e76f81b867e16423b17847a
Author: Matthias Klose <doko at debian.org>
Date:   Sun Aug 13 13:01:45 2006 +0200

    Import Debian changes 3.2-3
    
    ecj-bootstrap (3.2-3) unstable; urgency=low
    
      * Install classmap db in /usr/share/gcj/classmap.db, install jar.so
        in /usr/lib/gcj.
      * ecj-bootstrap-gcj.postinst: Use rebuild-gcj-db.
      * Build depend on gcj-4.1 (>= 4.1.1-13).
     ecj-bootstrap  (3.2-2) experimental; urgency=low
    
       * Build using the gcj backport from experimental.
       * Do not build the binary ecj.
---
 debian/changelog                     | 17 +++++++++----
 debian/control                       |  5 ++--
 debian/ecj-bootstrap-gcj.install     |  5 ++--
 debian/ecj-bootstrap-gcj.install.old |  3 ---
 debian/ecj-bootstrap-gcj.postinst    |  7 +++---
 debian/rules                         | 46 +++++++++++++++++++++++-------------
 6 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ca0c24..9b5c632 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,18 @@
-ecj-bootstrap (3.2-2) experimental; urgency=low
+ecj-bootstrap (3.2-3) unstable; urgency=low
 
-  * Build using the gcj backport from experimental.
-  * Do not build the binary ecj.
+  * Install classmap db in /usr/share/gcj/classmap.db, install jar.so
+    in /usr/lib/gcj.
+  * ecj-bootstrap-gcj.postinst: Use rebuild-gcj-db.
+  * Build depend on gcj-4.1 (>= 4.1.1-13).
 
- -- Matthias Klose <doko at debian.org>  Sun, 13 Aug 2006 13:01:45 +0200
+ -- Matthias Klose <doko at debian.org>  Sat,  2 Sep 2006 13:55:21 +0000
+
+ 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
 
diff --git a/debian/control b/debian/control
index 7a93918..16e2b6a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,12 @@ 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.1-11j1), fastjar, ant, dpkg (>= 1.13.19)
+Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.1 (>= 4.1.1-13), fastjar, ant, dpkg (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: ecj-bootstrap
 Architecture: all
-Depends: gij-4.1 (>= 4.1.0), libgcj7-jar (>= 4.1.0), java-common (>= 0.23)
+Depends: gij-4.1 (>= 4.1.1-13), libgcj7-jar (>= 4.1.1), java-common (>= 0.23)
 Recommends: ecj-bootstrap-gcj
 Suggests: ant
 Provides: ecj
@@ -23,6 +23,7 @@ Description: bootstrap version of the Eclipse Java compiler
 Package: ecj-bootstrap-gcj
 Architecture: any
 Depends: ecj-bootstrap (>= ${source:Version}), ${shlibs:Depends}
+Recommends: java-gcj-compat (>= 1.0.63)
 Description: bootstrap version of the Eclipse Java compiler (native version)
  This package provides a bootstrap version of the Eclipse JDT compiler which is
  distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit) and
diff --git a/debian/ecj-bootstrap-gcj.install b/debian/ecj-bootstrap-gcj.install
index 0145bdb..ac98286 100644
--- a/debian/ecj-bootstrap-gcj.install
+++ b/debian/ecj-bootstrap-gcj.install
@@ -1,2 +1,3 @@
-debian/tmp/usr/lib/java/ecj.jar.so
-debian/tmp/usr/share/gcj-*
+debian/tmp/usr/bin/ecj-bootstrap-gcj
+debian/tmp/usr/lib/gcj/ecj.jar.so
+debian/tmp/usr/share/gcj
diff --git a/debian/ecj-bootstrap-gcj.install.old b/debian/ecj-bootstrap-gcj.install.old
deleted file mode 100644
index b67c5f2..0000000
--- a/debian/ecj-bootstrap-gcj.install.old
+++ /dev/null
@@ -1,3 +0,0 @@
-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.postinst b/debian/ecj-bootstrap-gcj.postinst
index 5c62ade..6901eaa 100644
--- a/debian/ecj-bootstrap-gcj.postinst
+++ b/debian/ecj-bootstrap-gcj.postinst
@@ -1,8 +1,7 @@
 #! /bin/sh -e
 
-find /usr/share/gcj-4.1/classmap.d -name '*.db' -print0 \
-	| /usr/bin/gcj-dbtool-4.1 -0 -m /var/lib/gcj-4.1/classmap.db.tmp || exit 1
-
-mv /var/lib/gcj-4.1/classmap.db.tmp /var/lib/gcj-4.1/classmap.db
+if [ "$1" = configure ] && [ -x /usr/bin/rebuild-gcj-db ]; then
+    /usr/bin/rebuild-gcj-db
+fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index fa2a24d..734cc3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,17 +92,29 @@ endif
 
 ifeq ($(with_native),yes)
 	$(GCJ) -v \
-	    -O2 -g -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
+	    -O2 -g -Wl,-Bsymbolic,-O1 -shared -fPIC -fjni -findirect-dispatch \
 	    -o build/dist/ecj.jar.so 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
+	$(GCJ) -v \
+	    -O2 -g -Wl,-Bsymbolic,-O1 -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
 
+xxx:
+	$(GCJ) -v \
+	    -O2 -g -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
+	    -o /tmp/ecj.jar.so /usr/share/java/ecj.jar
+
+	$(GCJ) -v \
+	    -O2 -g -Wl,-Bsymbolic -fPIC -fjni -findirect-dispatch \
+	    --main=org.eclipse.jdt.internal.compiler.batch.Main \
+	    -o /tmp/ecj /usr/share/java/ecj.jar
+	objdump -x /tmp/ecj.jar.so | grep NEEDED
+	objdump -x /tmp/ecj | grep NEEDED
+
 install-ecj-bootstrap:
 	# Install pieces into proper hierarchy.
 	mkdir -p debian/tmp/usr/share/java
@@ -112,29 +124,29 @@ install-ecj-bootstrap:
 	install -m 755 ecj-bootstrap debian/tmp/usr/bin/
 
 ifeq ($(with_native),yes)
-	mkdir -p debian/tmp/usr/lib/java
-	install -m 644 build/dist/ecj.jar.so debian/tmp/usr/lib/java
+	mkdir -p debian/tmp/usr/lib/gcj
+	install -m 644 build/dist/ecj.jar.so debian/tmp/usr/lib/gcj
 
-#	# 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
+	mkdir -p debian/tmp/usr/share/gcj/classmap.d
+	gcj-dbtool-$(gcc_version) -n debian/tmp/usr/share/gcj/classmap.d/ecj-bootstrap.db
 
 	cd debian/tmp && \
 	for jar in $$(find usr/share/java -name '*.jar'); do \
-		echo $$jar '->' usr/lib/java/$$(basename $$jar).so; \
-		gcj-dbtool-$(gcc_version) -f usr/share/gcj-$(gcc_version)/classmap.d/ecj-bootstrap.db \
-			$$jar /usr/lib/java/$$(basename $$jar).so || exit 1; \
+		echo $$jar '->' usr/lib/gcj/$$(basename $$jar).so; \
+		gcj-dbtool-$(gcc_version) -f usr/share/gcj/classmap.d/ecj-bootstrap.db \
+			$$jar /usr/lib/gcj/$$(basename $$jar).so || exit 1; \
 	done
 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

More information about the pkg-java-commits mailing list