[ecj] 62/145: Import Debian changes 3.9.0-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 fe239444fc551f105b67716b59a8300cb463cc13
Author: Matthias Klose <doko at debian.org>
Date:   Sat May 3 16:46:31 2014 +0200

    Import Debian changes 3.9.0-2
    
    ecj (3.9.0-2) unstable; urgency=medium
    
      * Build using gcj-4.9.
---
 debian/changelog | 6 ++++++
 debian/control   | 2 +-
 debian/rules     | 4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3db23c4..5ca8143 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj (3.9.0-2) unstable; urgency=medium
+
+  * Build using gcj-4.9.
+
+ -- Matthias Klose <doko at debian.org>  Sat, 03 May 2014 16:46:31 +0200
+
 ecj (3.9.0-1) unstable; urgency=medium
 
   * Update to 4.3.1 (built from the R4_3_1 tag, identifies itself as 3.9.0).
diff --git a/debian/control b/debian/control
index 614a335..40bd3c4 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 (>= 4:4.8.1),
+ gcj-4.9-jdk (>= 4.9.0),
  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 033b298..8dd0277 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,11 @@ 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/')
+GCC_VERSION   := 4.9
 
 LIBGCJ_EXT    := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 | sed 's/.*\.//')
 LIBGCJ_SOVER  = $(LIBGCJ_EXT)
+LIBGCJ_SOVER  = 15
 REQ_VERSION   = 4.4.6
 
 ant_version = 1.7
@@ -16,7 +18,7 @@ ant_version =
 GCJ = gcj-$(GCC_VERSION)
 GIJ = gij-$(GCC_VERSION)
 GCJDBTOOL = gcj-dbtool-$(GCC_VERSION)
-GCJSUBDIR = /usr/lib/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER)
+GCJSUBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCC_VERSION)-$(LIBGCJ_SOVER)
 
 # work around ecj1 having fallen out of the gcc search path
 PATH := $(CURDIR):$(PATH)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git