This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ecj.
commit f4b2f604f995210a53c83e3cec6b396f9720f2d4 Author: Matthias Klose <[email protected]> Date: Sun Feb 15 22:34:28 2009 +0100 Imported Debian patch 3.4.2-4 --- debian/changelog | 13 +++---------- debian/control | 6 +++--- debian/rules | 25 +++++++++++++++++++------ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b68f34..fc249a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,8 @@ -ecj (3.4.2-3) experimental; urgency=low +ecj (3.4.2-4) unstable; urgency=low - * Fix ecj dependencies for gcj-4.4. + * Build using gcj-4.4-jdk on hppa. - -- Matthias Klose <[email protected]> Tue, 28 Apr 2009 07:56:20 +0200 - -ecj (3.4.2-2) experimental; urgency=low - - * Build using gcj-4.4-jdk. - * Build for hppa. - - -- Matthias Klose <[email protected]> Sun, 26 Apr 2009 21:02:40 +0200 + -- Matthias Klose <[email protected]> Sun, 15 Feb 2009 22:34:28 +0100 ecj (3.4.2-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 382f10d..187eab3 100644 --- a/debian/control +++ b/debian/control @@ -4,9 +4,9 @@ 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), - libecj-java (>= 3.4.2) [arm], unzip [arm], + gcj-4.3 (>= 4.3.0-1) [!hppa], gcj-4.4-jdk [hppa], + libgcj-bc (>= 4.2.1-2), + 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.7.3 diff --git a/debian/rules b/debian/rules index 1deddc3..34ca18e 100755 --- a/debian/rules +++ b/debian/rules @@ -5,10 +5,17 @@ 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.0 +ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) + GCC_VERSION = 4.4 + LIBGCJ_EXT = 10 + LIBGCJ_SOVER = 10 + REQ_VERSION = 4.4.0 +else + GCC_VERSION = 4.3 + LIBGCJ_EXT = 9 + LIBGCJ_SOVER = 90 + REQ_VERSION = 4.3.3 +endif ant_version = 1.7 ant_version = @@ -29,9 +36,15 @@ ifneq (,$(filter $(DEB_HOST_ARCH), arm)) with_sourcebuild := no endif -DEB_DH_GENCONTROL_ARGS = -- \ - '-Vpkg:gij=gcj-$(GCC_VERSION)-jdk (>= $(REQ_VERSION))' \ +ifneq (,$(filter $(DEB_HOST_ARCH), hppa)) + DEB_DH_GENCONTROL_ARGS = -- \ + '-Vpkg:gij=gcj-$(GCC_VERSION)-jre-headless (>= $(REQ_VERSION))' \ '-Vpkg:libgcjjar=gcj-$(GCC_VERSION)-jre-lib (>= $(REQ_VERSION))' +else + DEB_DH_GENCONTROL_ARGS = -- \ + '-Vpkg:gij=$(GIJ) (>= $(REQ_VERSION))' \ + '-Vpkg:libgcjjar=libgcj$(LIBGCJ_EXT)-jar (>= $(REQ_VERSION))' +endif JAR = eclipse-ecj.jar -- 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
