[libreoffice] 01/01: release 1:5.2.1-3; adapt SYSTEM_GCJ_VERSION detected for gcj-6 (>= 6.2.0-4)...

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 7a51ebc69a29267c36bc725f6e5a42aae35d5834
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Sep 17 01:32:32 2016 +0200

    release 1:5.2.1-3; adapt SYSTEM_GCJ_VERSION detected for gcj-6 (>= 6.2.0-4)...
---
 changelog | 7 ++++---
 rules     | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 78d1c67..6a41664 100644
--- a/changelog
+++ b/changelog
@@ -1,13 +1,14 @@
-libreoffice (1:5.2.1-3) UNRELEASED; urgency=medium
+libreoffice (1:5.2.1-3) unstable; urgency=medium
 
   * debian/patches/gtk3-use-style-updated-signal.diff: backport from master;
     use style-updated instead of style-set signal. This closes: #837356 and
     hopefully also closes: #836416 for real.
   * debian/patches/xfce-fallback-list.diff: remove again, didn't help
 
-  * debiain/control.in: _really_ remove font depends from libreoffice
+  * debian/control.in: _really_ remove font depends from libreoffice
+  * debian/rules: adapt SYSTEM_GCJ_VERSION detected for gcj-6 (>= 6.2.0-4)...
 
- -- Rene Engelhard <rene at debian.org>  Wed, 14 Sep 2016 08:11:38 +0200
+ -- Rene Engelhard <rene at debian.org>  Sat, 17 Sep 2016 01:13:20 +0200
 
 libreoffice (1:5.2.1-2) unstable; urgency=medium
 
diff --git a/rules b/rules
index d45e648..a75f4da 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