[libreoffice] 05/152: fix for SYSTEM_GCC_VERSION > 5

[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 afe32db5187aac5859fa933d6cc646a0689966c9
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 21 16:45:44 2015 +0200

    fix for SYSTEM_GCC_VERSION > 5
---
 changelog | 2 +-
 rules     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 271f617..d5eeb51 100644
--- a/changelog
+++ b/changelog
@@ -10,7 +10,7 @@ libreoffice (1:5.0.2-0ubuntu2) wily; urgency=medium
   * create profile defaulting to human style on unity (lp: #1508177)
   * reenable Ubuntu palette
 
- -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 21 Oct 2015 16:06:19 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com>  Wed, 21 Oct 2015 16:45:24 +0200
 
 libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium
 
diff --git a/rules b/rules
index 95f5ff2..6dce68e 100755
--- a/rules
+++ b/rules
@@ -735,6 +735,9 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
   ifeq (,$(strip $(SYSTEM_GCJ_VERSION)))
     $(warning SYSTEM_GCJ_VERSION empty, falling back to SYSTEM_GCC_VERSION)
     SYSTEM_GCJ_VERSION = $(SYSTEM_GCC_VERSION)
+    ifeq (5.,$(shell echo "$(SYSTEM_GCJ_VERSION)"|cut -b1-2))
+      SYSTEM_GCJ_VERSION = 5
+    endif
   endif
 endif
 

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