This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit b5590f0620c71c3113f3797f3d45f24fadc89b1a Author: Matthias Klose <[email protected]> Date: Wed Jun 8 19:25:06 2011 +0200 Imported Debian patch 3.5.1-2 --- debian/changelog | 13 ++++++++++--- debian/compat | 2 +- debian/control | 8 ++++---- debian/ecj-gcj.overrides | 1 + debian/rules | 26 +++++++++++++++++++------- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 72bf28f..6a44017 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ -ecj (3.5.1-1+sh4) unreleased; urgency=low +ecj (3.5.1-2) unstable; urgency=medium - * sh4 bootstrap + [ Steve Langasek ] + * Move ecj1 binary to the multiarch gcc directory so gcj can find it. + * Create a link to ecj1 in our build directory so that gcj can find it + for rebootstrapping ecj1. - -- Nobuhiro Iwamatsu <[email protected]> Tue, 15 Dec 2009 21:13:31 +0000 + [ Matthias Klose] + * Build with default gcj-jdk. + * ecj1: Provide a compatibility symlink in /usr/lib/gcc/ecj1. + + -- Matthias Klose <[email protected]> Wed, 08 Jun 2011 19:25:06 +0200 ecj (3.5.1-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index de39efb..d7111b9 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: java 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 (>= 5), - gcj-4.4-jdk, - libgcj-bc (>= 4.3.3-1), +Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 5), + gcj-jdk, + libgcj-bc (>= 4.4.6), libecj-java (>= 3.3.0+0728) [arm], unzip [arm], fastjar, ant, zip, dpkg (>= 1.13.19), python, time Build-Conflicts: ecj-bootstrap-gcj (<< 3.2.2) -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Package: ecj Architecture: any diff --git a/debian/ecj-gcj.overrides b/debian/ecj-gcj.overrides new file mode 100644 index 0000000..7bec7e3 --- /dev/null +++ b/debian/ecj-gcj.overrides @@ -0,0 +1 @@ +ecj-gcj binary: binary-or-shlib-defines-rpath diff --git a/debian/rules b/debian/rules index bbbe938..fa47a4b 100755 --- a/debian/rules +++ b/debian/rules @@ -5,10 +5,11 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -GCC_VERSION = 4.4 -LIBGCJ_EXT = 10 -LIBGCJ_SOVER = 10 -REQ_VERSION = 4.4.1 +GCC_VERSION = $(shell ls -l /usr/bin/gcj | sed 's/.*-> gcj-\(.*\)/\1/') + +LIBGCJ_EXT = 12 +LIBGCJ_SOVER = 12 +REQ_VERSION = 4.4.6 ant_version = 1.7 ant_version = @@ -17,6 +18,10 @@ GIJ = gij-$(GCC_VERSION) GCJDBTOOL = gcj-dbtool-$(GCC_VERSION) GCJSUBDIR = /usr/lib/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER) +# work around ecj1 having fallen out of the gcc search path +PATH := $(CURDIR):$(PATH) +export PATH + with_native := yes with_rebuild := yes with_sourcebuild := yes @@ -65,6 +70,7 @@ ifeq ($(with_sourcebuild),yes) mv ecj-sources.* build/bin ls -l . build/bin + ln -sf /usr/lib/gcc/ecj1 $(CURDIR)/ecj1 set -e; \ for list in $$(find build/bin -name 'ecj-sources.*'); do \ echo "building files in $$list ..."; \ @@ -183,8 +189,10 @@ endif install/ecj1:: ifeq ($(with_native),yes) - mkdir -p debian/ecj1/usr/lib/gcc - install -m 755 build/exe/ecj1 debian/ecj1/usr/lib/gcc/ + mkdir -p debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc + install -m 755 build/exe/ecj1 debian/ecj1/usr/lib/$(DEB_HOST_MULTIARCH)/gcc/ + dh_link -p ecj1 \ + /usr/lib/$(DEB_HOST_MULTIARCH)/gcc/ecj1 /usr/lib/gcc/ecj1 endif install/ecj-gcj:: @@ -198,6 +206,10 @@ endif ln -sf ecj.1.gz \ debian/ecj-gcj/usr/share/man/man1/ecj-gcj.1.gz + mkdir -p debian/ecj-gcj/usr/share/lintian/overrides + cp -p debian/ecj-gcj.overrides \ + debian/ecj-gcj/usr/share/lintian/overrides/ecj-gcj + binary-predeb/ecj1:: # sed -i 's/libgcj[1-9][^,]*//;s/,,/,/' debian/ecj1.substvars @@ -206,7 +218,7 @@ binary-predeb/ecj-gcj:: clean:: rm -rf build - rm -f debian/*.pyc + rm -f debian/*.pyc ecj1 RR=../cvs/R3_5_maintenance/ RR=../cvs/R3_5_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
