[ecj] 16/145: Import Debian changes 3.1.2-6

[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 07a3a61a95e8bd5fe72503daeec5eead5216f14e
Author: Matthias Klose <doko at debian.org>
Date:   Thu Jun 1 22:55:00 2006 +0200

    Import Debian changes 3.1.2-6
    
    ecj-bootstrap (3.1.2-6) unstable; urgency=low
    
      * ecj-bootstrap-gcj: Do not register an alternative for ecj.
      * ecj-bootstrap: Use ecj-bootstrap-gcj, if available.
      * The above changes set the bootclasspath to /usr/share/java/libgcj-4.1.jar,
        if no bootclasspath is set. Closes: #361608, #361806.
      * Do not try to rebuild the jar file using the gij on arm and m68k.
---
 debian/changelog                  | 10 ++++++++++
 debian/control                    |  4 ++--
 debian/ecj-bootstrap-gcj.postinst |  6 ------
 debian/rules                      |  9 +++------
 ecj-bootstrap                     | 33 ++++++++++++++++++++++-----------
 5 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c9769bf..8f36c6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ecj-bootstrap (3.1.2-6) unstable; urgency=low
+
+  * ecj-bootstrap-gcj: Do not register an alternative for ecj.
+  * ecj-bootstrap: Use ecj-bootstrap-gcj, if available.
+  * The above changes set the bootclasspath to /usr/share/java/libgcj-4.1.jar,
+    if no bootclasspath is set. Closes: #361608, #361806.
+  * Do not try to rebuild the jar file using the gij on arm and m68k.
+
+ -- Matthias Klose <doko at debian.org>  Thu,  1 Jun 2006 22:55:00 +0200
+
 ecj-bootstrap (3.1.2-5) unstable; urgency=low
 
   * Updated Standards-Version to 3.7.2. No changes needed.
diff --git a/debian/control b/debian/control
index 8786cc5..f24b4ba 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
+Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.1 (>= 4.1.0), fastjar, ant, dpkg (>= 1.13.19)
 Standards-Version: 3.7.2
 
 Package: ecj-bootstrap
@@ -22,7 +22,7 @@ Description: bootstrap version of the Eclipse Java compiler
 
 Package: ecj-bootstrap-gcj
 Architecture: any
-Depends: ecj-bootstrap (= ${Source-Version}), ${shlibs:Depends}
+Depends: ecj-bootstrap (>= ${source:Version}), ${shlibs:Depends}
 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.postinst b/debian/ecj-bootstrap-gcj.postinst
index 1f6860b..5c62ade 100644
--- a/debian/ecj-bootstrap-gcj.postinst
+++ b/debian/ecj-bootstrap-gcj.postinst
@@ -1,11 +1,5 @@
 #! /bin/sh -e
 
-update-alternatives --quiet --install /usr/bin/ecj ecj /usr/bin/ecj-bootstrap-gcj 4 \
-  --slave /usr/share/man/man1/ecj.1.gz ecj.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
-
-update-alternatives --quiet --install /usr/bin/javac javac /usr/bin/ecj-bootstrap-gcj 144 \
-  --slave /usr/share/man/man1/javac.1.gz javac.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
-
 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
 
diff --git a/debian/rules b/debian/rules
index db034da..4dc4518 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,12 +14,9 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 with_native := yes
 with_rebuild := yes
 
-#ifeq ($(DEB_HOST_ARCH),arm)
-#  with_rebuild := no
-#endif
-#ifeq ($(DEB_HOST_ARCH),hppa)
-#  with_rebuild := no
-#endif
+ifneq (,$(findstring $(DEB_HOST_ARCH), arm m68k))
+  with_rebuild := no
+endif
 
 default: build
 
diff --git a/ecj-bootstrap b/ecj-bootstrap
index 4cd5165..9ce7750 100644
--- a/ecj-bootstrap
+++ b/ecj-bootstrap
@@ -1,20 +1,31 @@
-#!/bin/sh
+#! /bin/sh
 
-case $CLASSPATH in
-  */usr/share/java/ecj.jar*) ;;
-  *) CLASSPATH=${CLASSPATH:+$CLASSPATH:}/usr/share/java/ecj.jar
-esac
+ver=4.1
 
 case "$*" in
   *-bootclasspath*) ;;
   *)
     if [ ! -f /usr/lib/jvm/java-gcj/jre/lib/rt.jar ]; then
-      bcoption="-bootclasspath /usr/share/java/libgcj-4.1.jar"
+      bcoption="-bootclasspath /usr/share/java/libgcj-$ver.jar"
     fi
 esac
-export CLASSPATH
 
-exec /usr/bin/gij-4.1 \
-    -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.1/classmap.db \
-    -Djava.ext.dirs=/usr/lib/java-ext:/usr/share/java-ext \
-    org.eclipse.jdt.internal.compiler.batch.Main $bcoption ${1+"$@"}
+if [ -x /usr/bin/ecj-bootstrap-gcj ]; then
+
+    exec /usr/bin/ecj-bootstrap-gcj \
+	$bcoption ${1+"$@"}
+
+else
+
+    case $CLASSPATH in
+      */usr/share/java/ecj.jar*) ;;
+      *) CLASSPATH=${CLASSPATH:+$CLASSPATH:}/usr/share/java/ecj.jar
+    esac
+    export CLASSPATH
+
+    exec /usr/bin/gij-$ver \
+        -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-$ver/classmap.db \
+        -Djava.ext.dirs=/usr/lib/java-ext:/usr/share/java-ext \
+        org.eclipse.jdt.internal.compiler.batch.Main $bcoption ${1+"$@"}
+
+fi

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