[libreoffice] 01/01: revert libgtk-3-dev (>= 3.20~) bump
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit d5e3c0547e6ccaab318967221240aeb1c2dcad28
Author: Rene Engelhard <rene@debian.org>
Date: Thu May 26 20:58:26 2016 +0200
revert libgtk-3-dev (>= 3.20~) bump
---
changelog | 3 ++-
control | 2 +-
rules | 6 +-----
tests/control | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/changelog b/changelog
index e28a72f..bd9204c 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,8 @@ libreoffice (1:5.1.3-2) UNRELEASED; urgency=medium
hunks which do not apply...
* debian/rules:
- - move GTK3_MINVER setting down in rules so the conditional gets honoured
+ - move GTK3_MINVER setting down in rules so the conditional gets honoured;
+ gtk3 3.20 is available anywhere in stretch/sid so revert bump to >= 3.20
- migrate from --ddeb-migration to --dbgsym-migration
* debian/source/include-binaries, tarballs/mdds-1.2.0.tar.bz2: add
diff --git a/control b/control
index 986d40f..8b84c95 100644
--- a/control
+++ b/control
@@ -78,7 +78,7 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
libgraphite2-dev (>= 0.9.3),
libgstreamer-plugins-base1.0-dev,
libgstreamer1.0-dev,
- libgtk-3-dev (>= 3.20~),
+ libgtk-3-dev (>= 3.8~),
libgtk2.0-dev (>= 2.10),
libharfbuzz-dev (>= 0.9.18),
libhsqldb1.8.0-java (>> 1.8.0.10) [!mips64],
diff --git a/rules b/rules
index 8f65a7f..b7b2778 100755
--- a/rules
+++ b/rules
@@ -1339,11 +1339,7 @@ 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
+ GTK3_MINVER=3.8~
BUILD_DEPS += , libgtk-3-dev (>= $(GTK3_MINVER))
ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
$(error GTK3 build fails without system-cairo!!)
diff --git a/tests/control b/tests/control
index d7e8e65..ff5cb80 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libarchive-zip-perl, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.0.2-4) , opencollada-dev (>= 0.1.0~2 [...]
Tests: pyuno-import
Depends: python3-uno
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: