[ecj] 35/37: Imported Debian patch 3.8.2-4
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jun 25 23:35:14 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ecj.
commit ae77de0d9e2887ec81cb66f92a552ab7e2522598
Author: Matthias Klose <doko at debian.org>
Date: Mon Jul 1 01:17:16 2013 +0200
Imported Debian patch 3.8.2-4
---
debian/changelog | 6 ++++++
debian/control | 2 +-
debian/rules | 3 ---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2ba4746..2737b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj (3.8.2-4) unstable; urgency=low
+
+ * Build using gcj-4.8 on all architectures.
+
+ -- Matthias Klose <doko at debian.org> Mon, 01 Jul 2013 01:17:16 +0200
+
ecj (3.8.2-2) unstable; urgency=low
* Build using gcj-4.6 on mips.
diff --git a/debian/control b/debian/control
index 5db8491..4473c62 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Matthias Klose <doko at debian.org>
Build-Depends: cdbs (>= 0.4.90ubuntu9), debhelper (>= 5),
- gcj-jdk, gcj-4.6-jdk [mips],
+ gcj-jdk (>= 4:4.8.1),
libgcj-bc (>= 4.6.3),
libecj-java (>= 3.8.2) [arm], unzip [arm],
fastjar, ant, zip, dpkg (>= 1.13.19), python, time
diff --git a/debian/rules b/debian/rules
index 45619f3..3ec6513 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,6 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
GCC_VERSION := $(shell ls -l /usr/bin/gcj | sed 's/.*-> gcj-\(.*\)/\1/')
-ifeq ($(DEB_HOST_ARCH),mips)
- GCC_VERSION := 4.6
-endif
LIBGCJ_EXT := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 | sed 's/.*\.//')
LIBGCJ_SOVER = $(LIBGCJ_EXT)
--
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