[libreoffice] 111/152: fix gcj version (thanks Rico)

[Rene Engelhard]

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

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit bd85243d69f628c7dfc85afdf151f515b82d8fcd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Sep 29 21:39:13 2016 +0200

    fix gcj version (thanks Rico)
---
 changelog | 3 ++-
 rules     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 22c2289..94c633c 100644
--- a/changelog
+++ b/changelog
@@ -1,8 +1,9 @@
 libreoffice (1:5.2.2~rc2-0ubuntu1) yakkety; urgency=medium
 
   * new upstream rc
+  * fix gcj version (thanks Rico)
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Mon, 26 Sep 2016 10:49:39 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Thu, 29 Sep 2016 21:35:50 +0200
 
 libreoffice (1:5.2.1~rc2-0ubuntu1) yakkety; urgency=medium
 
diff --git a/rules b/rules
index 6da9cfa..5325cf2 100755
--- a/rules
+++ b/rules
@@ -38,7 +38,7 @@ export gb_SHELL:=$(SHELL)
 #SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
 #FIXME
 SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\../\1/p' | cut -d" " -f1)
-SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-//)
+SYSTEM_GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-// | sed -e s/$(DEB_HOST_MULTIARCH)-//)
 
 PKGDIR:=debian/libreoffice
 OODIRNAME=libreoffice

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