[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[libreoffice] 02/02: git update; gtk3 configure default reversed upstream



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

rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.

commit 29b1ab08759078c093d08a512e17706440a1414a
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Jun 12 13:19:38 2015 +0200

    git update; gtk3 configure default reversed upstream
---
 changelog | 2 +-
 rules     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index b168dd9..c26bc38 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.1.0~alpha1~git20150604-1) UNRELEASED; urgency=medium
+libreoffice (1:5.1.0~alpha1~git20150612-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/rules b/rules
index bda52f8..bc9544d 100755
--- a/rules
+++ b/rules
@@ -1231,11 +1231,11 @@ else
 endif
 ifeq "$(BUILD_GTK3)" "y"
        BUILD_DEPS += , libgtk-3-dev (>= 3.2~)
-       CONFIGURE_FLAGS+= --enable-gtk3
   ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
   $(error GTK3 build fails without system-cairo!!)
   endif
 else
+       CONFIGURE_FLAGS+= --disable-gtk3
        DEBHELPER_OPTIONS+= -Nlibreoffice-gtk3
 endif
 

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


Reply to: