[ecj] 31/37: Imported Debian patch 3.5.1-5

[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 bc2e189a7c6f58aa336b51173d171aa60a7406b0
Author: Matthias Klose <doko at debian.org>
Date:   Sun Jan 6 17:36:18 2013 +0100

    Imported Debian patch 3.5.1-5
---
 debian/changelog | 6 ++++++
 debian/rules     | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed4349f..6d13cc1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ecj (3.5.1-5) unstable; urgency=low
+
+  * Fix the libgcj so version.
+
+ -- Matthias Klose <doko at debian.org>  Sun, 06 Jan 2013 17:36:18 +0100
+
 ecj (3.5.1-4) unstable; urgency=low
 
   * Rebuild using GCC-4.7.
diff --git a/debian/rules b/debian/rules
index 10754c8..99f8caf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 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   := $(shell ls -l /usr/bin/gcj | sed 's/.*-> gcj-\(.*\)/\1/')
 
-LIBGCJ_EXT    = 12
-LIBGCJ_SOVER  = 12
+LIBGCJ_EXT    := $(shell ls -l /usr/lib/$(DEB_HOST_MULTIARCH)/libgcj_bc.so.1 | sed 's/.*\.//')
+LIBGCJ_SOVER  = $(LIBGCJ_EXT)
 REQ_VERSION   = 4.4.6
 
 ant_version = 1.7

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