[ecj] 14/145: Import Debian changes 3.1.2-4
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 95188d6f44be88e704e3b3d89aec4fb6d2e5e938
Author: Matthias Klose <doko at debian.org>
Date: Sat Jan 28 08:35:09 2006 +0000
Import Debian changes 3.1.2-4
ecj-bootstrap (3.1.2-4) unstable; urgency=low
* Build using gij-4.1/gcj-4.1.
* Rebuild using ecj on all architectures.
* Remove conflict on virtual package ecj.
ecj-bootstrap (3.1.2-3) experimental; urgency=low
* Build using gcj-4.1, upload to experimental.
---
debian/changelog | 40 ++++++++++++++++++++++++++++++++++++---
debian/control | 11 +++++------
debian/ecj-bootstrap-gcj.postinst | 8 +++-----
debian/rules | 22 +++++++++------------
ecj-bootstrap | 13 ++++++++++---
5 files changed, 64 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c8fe85a..ab4435c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,42 @@
-ecj-bootstrap (3.1.2-3) experimental; urgency=low
+ecj-bootstrap (3.1.2-4) unstable; urgency=low
- * Build using gcj-4.1, upload to experimental.
+ * Build using gij-4.1/gcj-4.1.
+ * Rebuild using ecj on all architectures.
+ * Remove conflict on virtual package ecj.
- -- Matthias Klose <doko at debian.org> Sat, 28 Jan 2006 08:35:09 +0000
+ -- Matthias Klose <doko at debian.org> Sat, 1 Apr 2006 11:29:03 +0000
+
+ ecj-bootstrap (3.1.2-3) experimental; urgency=low
+
+ * Build using gcj-4.1, upload to experimental.
+
+ -- Matthias Klose <doko at debian.org> Sat, 28 Jan 2006 08:35:09 +0000
+
+ecj-bootstrap (3.1.2-2ubuntu3) dapper; urgency=low
+
+ * Use gij-4.1 in the package scripts.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 26 Feb 2006 21:00:44 +0000
+
+ecj-bootstrap (3.1.2-2ubuntu2) dapper; urgency=low
+
+ * Build using gcj-4.1.
+
+ -- Matthias Klose <doko at ubuntu.com> Sun, 19 Feb 2006 01:07:40 +0000
+
+ecj-bootstrap (3.1.2-2build1) dapper; urgency=low
+
+ * Require gcj-4.0.2-9 to build.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 16 Feb 2006 03:18:22 +0000
+
+ecj-bootstrap (3.1.2-2) unstable; urgency=low
+
+ * Set the bootclasspath to /usr/share/java/libgcj-4.0.jar, if not called
+ with the -bootclasspath and /usr/lib/jvm/java-gcj/jre/lib/rt.jar does
+ not exist (java-gcj-compat not installed). Closes: #350542.
+
+ -- Matthias Klose <doko at debian.org> Thu, 9 Feb 2006 16:33:45 +0000
ecj-bootstrap (3.1.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 2fda22a..be803c0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,19 @@ 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-0exp7), fastjar, ant
+Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.1 (>= 4.1.0), fastjar, ant
Standards-Version: 3.6.2
Package: ecj-bootstrap
Architecture: all
-Depends: gij-4.1 (>= 4.1-0exp7), libgcj7-jar, java-common (>= 0.22ubuntu1)
+Depends: gij-4.1 (>= 4.1.0), libgcj7-jar (>= 4.1.0), java-common (>= 0.23)
Recommends: ecj-bootstrap-gcj
-Suggests: libant1.6-java | ant
+Suggests: ant
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
distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit) and
- is compatible with Java 1.3 and 1.4.
+ is compatible with Java 1.3, 1.4 and 1.5.
.
This bootstrap version should be used for uploading initial versions of
packages which are a dependency of Eclipse and build with ECJ.
@@ -27,7 +26,7 @@ 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
- is compatible with Java 1.3 and 1.4.
+ is compatible with Java 1.3, 1.4 and 1.5.
.
This bootstrap version should be used for uploading initial versions of
packages which are a dependency of Eclipse and build with ECJ.
diff --git a/debian/ecj-bootstrap-gcj.postinst b/debian/ecj-bootstrap-gcj.postinst
index 083b0da..1f6860b 100644
--- a/debian/ecj-bootstrap-gcj.postinst
+++ b/debian/ecj-bootstrap-gcj.postinst
@@ -1,16 +1,14 @@
#! /bin/sh -e
-v=4.1
-
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-$v/classmap.d -name '*.db' -print0 \
- | /usr/bin/gcj-dbtool-$v -0 -m /var/lib/gcj-$v/classmap.db.tmp || exit 1
+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-$v/classmap.db.tmp /var/lib/gcj-$v/classmap.db
+mv /var/lib/gcj-4.1/classmap.db.tmp /var/lib/gcj-4.1/classmap.db
#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index 5071a34..db034da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,26 +9,22 @@ ant_version =
GCJ = gcj-$(gcc_version)
GIJ = gij-$(gcc_version)
-#DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-#ifeq ($(DEB_HOST_ARCH),amd64)
-# DH_OPTIONS = -Necj-bootstrap-ecj
-# export DH_OPTIONS
-#else
-# with_native := yes
-#endif
+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
+
+#ifeq ($(DEB_HOST_ARCH),arm)
+# with_rebuild := no
+#endif
+#ifeq ($(DEB_HOST_ARCH),hppa)
+# with_rebuild := no
+#endif
default: build
eclipse_root = ../eclipse-3.1.2/source-tree
+eclipse_root = ../s
get-source:
test -d $(eclipse_root)
diff --git a/ecj-bootstrap b/ecj-bootstrap
index 89f0e13..4cd5165 100644
--- a/ecj-bootstrap
+++ b/ecj-bootstrap
@@ -1,13 +1,20 @@
#!/bin/sh
case $CLASSPATH in
-*/usr/share/java/ecj.jar*) ;;
-*) CLASSPATH=$CLASSPATH:/usr/share/java/ecj.jar
+ */usr/share/java/ecj.jar*) ;;
+ *) CLASSPATH=${CLASSPATH:+$CLASSPATH:}/usr/share/java/ecj.jar
esac
+case "$*" in
+ *-bootclasspath*) ;;
+ *)
+ if [ ! -f /usr/lib/jvm/java-gcj/jre/lib/rt.jar ]; then
+ bcoption="-bootclasspath /usr/share/java/libgcj-4.1.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 ${1+"$@"}
+ org.eclipse.jdt.internal.compiler.batch.Main $bcoption ${1+"$@"}
--
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