This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit 1ad2a5ccc66a73856ffc9856a571b6f552193ac1 Author: Matthias Klose <[email protected]> Date: Sat Jan 28 08:35:09 2006 +0000 Import Debian changes 3.1.2-3 ecj-bootstrap (3.1.2-3) experimental; urgency=low * Build using gcj-4.1, upload to experimental. --- debian/changelog | 8 +++----- debian/control | 4 ++-- debian/ecj-bootstrap-gcj.postinst | 8 +++++--- debian/rules | 5 ++--- ecj-bootstrap | 17 +++++------------ 5 files changed, 17 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7a1f0c5..c8fe85a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,8 @@ -ecj-bootstrap (3.1.2-2) unstable; urgency=low +ecj-bootstrap (3.1.2-3) experimental; 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. + * Build using gcj-4.1, upload to experimental. - -- Matthias Klose <[email protected]> Thu, 9 Feb 2006 16:33:45 +0000 + -- Matthias Klose <[email protected]> Sat, 28 Jan 2006 08:35:09 +0000 ecj-bootstrap (3.1.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index b5d9c98..2fda22a 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: devel Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Jerry Haltom <[email protected]>, Michael Koch <[email protected]>, Matthias Klose <[email protected]> -Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.0 (>= 4.0.2-7), fastjar, ant +Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gcj-4.1 (>= 4.1-0exp7), fastjar, ant Standards-Version: 3.6.2 Package: ecj-bootstrap Architecture: all -Depends: gij-4.0 (>= 4.0.2-6), libgcj6-jar, java-common (>= 0.22ubuntu1) +Depends: gij-4.1 (>= 4.1-0exp7), libgcj7-jar, java-common (>= 0.22ubuntu1) Recommends: ecj-bootstrap-gcj Suggests: libant1.6-java | ant Provides: ecj diff --git a/debian/ecj-bootstrap-gcj.postinst b/debian/ecj-bootstrap-gcj.postinst index 87bf362..083b0da 100644 --- a/debian/ecj-bootstrap-gcj.postinst +++ b/debian/ecj-bootstrap-gcj.postinst @@ -1,14 +1,16 @@ #! /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-4.0/classmap.d -name '*.db' -print0 \ - | /usr/bin/gcj-dbtool-4.0 -0 -m /var/lib/gcj-4.0/classmap.db.tmp || exit 1 +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 -mv /var/lib/gcj-4.0/classmap.db.tmp /var/lib/gcj-4.0/classmap.db +mv /var/lib/gcj-$v/classmap.db.tmp /var/lib/gcj-$v/classmap.db #DEBHELPER# diff --git a/debian/rules b/debian/rules index a20ffe7..5071a34 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -gcc_version = 4.0 +gcc_version = 4.1 ant_version = 1.6 ant_version = GCJ = gcj-$(gcc_version) @@ -28,8 +28,7 @@ endif default: build -eclipse_root = ../eclipse-3.1.1/source-tree -eclipse_root = ../s +eclipse_root = ../eclipse-3.1.2/source-tree get-source: test -d $(eclipse_root) diff --git a/ecj-bootstrap b/ecj-bootstrap index 1eff49b..89f0e13 100644 --- a/ecj-bootstrap +++ b/ecj-bootstrap @@ -1,20 +1,13 @@ #!/bin/sh case $CLASSPATH in - */usr/share/java/ecj.jar*) ;; - *) CLASSPATH=${CLASSPATH:+$CLASSPATH:}/usr/share/java/ecj.jar +*/usr/share/java/ecj.jar*) ;; +*) 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.0.jar" - fi -esac export CLASSPATH -exec /usr/bin/gij-4.0 \ - -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \ +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+"$@"} + org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
