[libreoffice] 01/04: Revert "apparently we need newer libmwaw (at least for some tests to work)"

[Rene Engelhard]

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

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

commit 647fc28d7ca5c2f0d1edaaf6d789efbe31294744
Author: Rene Engelhard <rene at debian.org>
Date:   Tue May 2 23:12:32 2017 +0200

    Revert "apparently we need newer libmwaw (at least for some tests to work)"
    
    This reverts commit f83c2461f8ffb6b13e04a5d3bd3672afb5c5b6b1.
---
 control       | 2 +-
 rules         | 7 +------
 tests/control | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/control b/control
index f2feea7..a833f3a 100644
--- a/control
+++ b/control
@@ -96,7 +96,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                liblpsolve55-dev (>= 5.5.0.13-5+b1),
                libmdds-dev (>= 1.2),
                libmspub-dev (>= 0.1),
-               libmwaw-dev (>= 0.3.11),
+               libmwaw-dev (>= 0.3.1),
                libmysqlcppconn-dev (>= 1.1.7-4),
                libmythes-dev (>= 2:1.2),
                libneon27-gnutls-dev,
diff --git a/rules b/rules
index 0ec01b2..4f70e40 100755
--- a/rules
+++ b/rules
@@ -673,7 +673,7 @@ endif
 # Debian Stretch
 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 libmwaw cppunit,$(SYSTEM_STUFF))
+  SYSTEM_STUFF := $(filter-out libzmf libstaroffice orcus libgltf,$(SYSTEM_STUFF))
   STRETCH_BACKPORT=y
 endif
 ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
@@ -1176,12 +1176,7 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
 	BUILD_DEPS += , libmspub-dev (>= 0.1)
   endif
   ifneq (,$(filter libmwaw, $(SYSTEM_STUFF)))
-    # FIXME: should be checked for upstream, but apparently isn't...
-    ifeq "$(RUN_MAKE_CHECK)" "y"
-	BUILD_DEPS += , libmwaw-dev (>= 0.3.11)
-    else
 	BUILD_DEPS += , libmwaw-dev (>= 0.3.1)
-    endif
   endif
   ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libodfgen-dev (>= 0.1)
diff --git a/tests/control b/tests/control
index 996ef5c..41e80bf 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, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, 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.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, 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.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
 
 Tests: pyuno-import
 Depends: python3-uno

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