[libreoffice] 04/05: Bump glib/gtk/dconf dependencies according to configure.ac

[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 b11fd0abcff29afad29653715760d1308b0bfaa9
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date:   Sun Aug 6 14:24:07 2017 +0200

    Bump glib/gtk/dconf dependencies according to configure.ac
---
 control |  8 ++++----
 rules   | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/control b/control
index 5882108..d08ff0c 100644
--- a/control
+++ b/control
@@ -64,7 +64,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libcups2-dev,
                libcurl4-gnutls-dev,
                libdbus-glib-1-dev (>= 0.70),
-               libdconf-dev,
+               libdconf-dev (>= 0.15.2),
                libe-book-dev,
                libebook1.2-dev,
                libeot-dev,
@@ -77,7 +77,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libfreetype6-dev (>= 2.2.0),
                libgirepository1.0-dev (>= 1.32),
                libgl1-mesa-dev,
-               libglib2.0-dev (>= 2.15.0),
+               libglib2.0-dev (>= 2.38.0),
                libglm-dev (>= 0.9.6.3),
                libgltf-dev (>= 0.1.0),
                libgpg-error-dev,
@@ -86,8 +86,8 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libgraphite2-dev (>= 0.9.3),
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
-               libgtk-3-dev (>= 3.8~),
-               libgtk2.0-dev (>= 2.10),
+               libgtk-3-dev (>= 3.8.0),
+               libgtk2.0-dev (>= 2.18.0),
                libharfbuzz-dev (>= 0.9.42),
                libhsqldb1.8.0-java (>> 1.8.0.10) [!hppa !ia64 !mips64 !s390 !sparc],
                libhunspell-dev (>= 1.1.5-2),
diff --git a/rules b/rules
index cb95fee..aa4eb77 100755
--- a/rules
+++ b/rules
@@ -1349,11 +1349,10 @@ ifeq "$(BUILD_GTK)" "n"
 	CONFIGURE_FLAGS+= --disable-gtk
 	DEBHELPER_OPTIONS+= -Nlibreoffice-gtk2 -Nlibreoffice-gnome
 else
-	BUILD_DEPS += , libgtk2.0-dev (>= 2.10)
+	BUILD_DEPS += , libgtk2.0-dev (>= 2.18.0)
 endif
 ifeq "$(BUILD_GTK3)" "y"
-	GTK3_MINVER=3.8~
-       BUILD_DEPS += , libgtk-3-dev (>= $(GTK3_MINVER))
+	BUILD_DEPS += , libgtk-3-dev (>= 3.8.0), libglib2.0-dev (>= 2.38.0)
   ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
   $(error GTK3 build fails without system-cairo!!)
   endif
@@ -1534,7 +1533,9 @@ ifneq (,$(filter gpgmepp, $(SYSTEM_STUFF)))
 endif
 
 ifeq "$(ENABLE_GIO)" "y"
-	BUILD_DEPS += , libglib2.0-dev (>= 2.15.0)
+  ifneq "$(BUILD_GTK3)" "y"
+	BUILD_DEPS += , libglib2.0-dev (>= 2.26.0)
+  endif
 else
 	CONFIGURE_FLAGS += --disable-gio
 endif
@@ -1542,7 +1543,7 @@ endif
 	BUILD_DEPS += , gettext
 
 ifeq "$(ENABLE_DCONF)" "y"
-	BUILD_DEPS += , libdconf-dev
+	BUILD_DEPS += , libdconf-dev (>= 0.15.2)
 else
 	CONFIGURE_FLAGS += --disable-dconf
 endif

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