[ecj] 59/145: Import Debian changes 3.8.2-2

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit 8d891aa6bc88965ae8da3b77d93534d5058042ed
Author: Matthias Klose <doko at debian.org>
Date:   Mon Apr 8 18:56:06 2013 +0200

    Import Debian changes 3.8.2-2
    
    ecj (3.8.2-2) unstable; urgency=low
    
      * Build using gcj-4.6 on mips.
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 debian/rules     | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b24ffc0..2ba4746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj (3.8.2-2) unstable; urgency=low
+
+  * Build using gcj-4.6 on mips.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 08 Apr 2013 18:56:06 +0200
+
 ecj (3.8.2-1) unstable; urgency=low
 
   * Update to 3.8.2 (built from the R3_8_2 tag, identifies itself as 3.8.3).
diff --git a/debian/control b/debian/control
index c6b4570..5db8491 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-jdk, gcj-4.6-jdk [mips],
  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 3ec6513..45619f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@ 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