[libreoffice] 02/02: move GTK3_MINVER setting down in rules so the conditional gets honoured
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 2b5d378f22b6971740d5c67a62e01da38ecfb9f1
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Thu May 19 14:34:23 2016 +0200
move GTK3_MINVER setting down in rules so the conditional gets honoured
---
changelog | 3 +++
rules | 10 +++++-----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 2d2d335..1a55d99 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,9 @@ libreoffice (1:5.1.3-2) UNRELEASED; urgency=medium
* debian/patches/liborcus-0.11.diff: remove Mac OS and Windows-specific
hunks which do not apply...
+ * debian/rules:
+ - move GTK3_MINVER setting down in rules so the conditional gets honoured
+
* debian/source/include-binaries, tarballs/mdds-1.2.0.tar.bz2: add
forgotten mdds-1.2.0.tar.bz2
diff --git a/rules b/rules
index 9cfb5d1..32f2d0f 100755
--- a/rules
+++ b/rules
@@ -381,11 +381,6 @@ ENABLE_SYSTRAY=n
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
#endif
-ifneq "$(JESSIE_BACKPORT)" "y"
-GTK3_MINVER=3.20~
-else
-GTK3_MINVER=3.8~
-endif
ifeq "$(BUILD_GTK3)" "y"
ENABLE_INTROSPECTION=y
endif
@@ -1344,6 +1339,11 @@ else
BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
endif
ifeq "$(BUILD_GTK3)" "y"
+ ifneq "$(JESSIE_BACKPORT)" "y"
+ GTK3_MINVER=3.20~
+ else
+ GTK3_MINVER=3.8~
+ endif
BUILD_DEPS += , libgtk-3-dev (>= $(GTK3_MINVER))
ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
$(error GTK3 build fails without system-cairo!!)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: