[libreoffice] 08/09: be consequent and bump the build-dependencies for the DLP libs when we run the tests

[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 fb040459c6c051559b9d39016ae9cd99d1c26d7b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Mon Aug 7 19:42:38 2017 +0200

    be consequent and bump the build-dependencies for the DLP libs when we run the tests
    
    based on patch by Rico Tzschichholz
---
 changelog | 2 ++
 control   | 5 +++++
 rules     | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/changelog b/changelog
index 12c4386..a713f13 100644
--- a/changelog
+++ b/changelog
@@ -7,6 +7,8 @@ libreoffice (1:5.4.0-2) UNRELEASED; urgency=medium
     - set UNO_LIBS_DBG_ROOT to fix gdb helper installation for uno-libs3 again
       and make -core-dbgsym recommends uno-libs3-dbgsym (same reason as above)
     - generate and install apparmor profiles
+    - be consequent and bump the build-dependencies for the DLP libs when
+      we run the tests; based on patch by Rico Tzschichholz
   * debian/control*in:
     - move to policy 4.0.1; extra -> optional
 
diff --git a/control b/control
index 2fe6b81..19a960e 100644
--- a/control
+++ b/control
@@ -66,10 +66,12 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libdbus-glib-1-dev (>= 0.70),
                libdconf-dev (>= 0.15.2),
                libe-book-dev,
+               libe-book-dev (>= 0.1.2) <!nocheck>,
                libebook1.2-dev,
                libeot-dev,
                libepoxy-dev (>= 1.2),
                libetonyek-dev,
+               libetonyek-dev (>= 0.1.5) <!nocheck>,
                libexpat1-dev,
                libexttextcat-dev (>= 3.4.1),
                libfontconfig1-dev,
@@ -102,6 +104,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libmdds-dev (>= 1.2),
                libmspub-dev (>= 0.1),
                libmwaw-dev (>= 0.3.1),
+               libmwaw-dev (>= 0.3.11) <!nocheck>,
                libmysqlcppconn-dev (>= 1.1.7-4),
                libmythes-dev (>= 2:1.2),
                libneon27-gnutls-dev,
@@ -123,12 +126,14 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libsane-dev,
                libsm-dev,
                libstaroffice-dev,
+               libstaroffice-dev (>= 0.0.3) <!nocheck>,
                libsuitesparse-dev (>= 1:3.4.0),
                libvisio-dev (>= 0.1),
                libvlc5 (>= 2.0.8),
                libwpd-dev (>= 0.10),
                libwpg-dev (>= 0.3),
                libwps-dev (>= 0.4),
+               libwps-dev (>= 0.4.6) <!nocheck>,
                libx11-dev,
                libxaw7-dev,
                libxext-dev,
diff --git a/rules b/rules
index 0f0986e..b8ccbaf 100755
--- a/rules
+++ b/rules
@@ -688,6 +688,9 @@ endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "stretch-backports"
   BUGS=mailto:debian-backports at lists.debian.org
   SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf cppunit xmlsec,$(SYSTEM_STUFF))
+  ifeq "$(RUN_MAKE_CHECK)" "y"
+    SYSTEM_STUFF := $(filter-out libwps libmwaw,$(SYSTEM_STUFF))
+  endif
   STRETCH_BACKPORT=y
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -1177,6 +1180,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
   endif
   ifneq (,$(filter libwps, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libwps-dev (>= 0.4)
+	BUILD_DEPS += , libwps-dev (>= 0.4.6) <!nocheck>
   endif
   ifneq (,$(filter libwpg, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libwpg-dev (>= 0.3)
@@ -1192,12 +1196,14 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
   endif
   ifneq (,$(filter libmwaw, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libmwaw-dev (>= 0.3.1)
+	BUILD_DEPS += , libmwaw-dev (>= 0.3.11) <!nocheck>
   endif
   ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libodfgen-dev (>= 0.1)
   endif
   ifneq (,$(filter libetonyek, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libetonyek-dev
+	BUILD_DEPS += , libetonyek-dev (>= 0.1.5) <!nocheck>
   endif
   ifneq (,$(filter libfreehand, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libfreehand-dev (>= 0.1)
@@ -1213,9 +1219,11 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
   endif
   ifneq (,$(filter libstaroffice, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libstaroffice-dev
+	BUILD_DEPS += , libstaroffice-dev (>= 0.0.3) <!nocheck>
   endif
   ifneq (,$(filter libebook, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libe-book-dev
+	BUILD_DEPS += , libe-book-dev (>= 0.1.2) <!nocheck>
   endif
   ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libcmis-dev (>= $(LIBCMIS_MINVER))

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