[libreoffice] 04/06: temporarily use internal cppunit

[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 743143403b4cd5b8712db65f6c097f72b10521a7
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Apr 16 09:30:41 2017 +0200

    temporarily use internal cppunit
---
 changelog | 9 ++++++---
 control   | 1 -
 rules     | 8 ++------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/changelog b/changelog
index e265cae..f34503b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~alpha0~git20170415-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~alpha0~git20170416-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
     - is now able to do "insert->image, choose pdf". Not insert->docunent
@@ -10,8 +10,11 @@ libreoffice (1:5.4.0~alpha0~git20170415-1) UNRELEASED; urgency=medium
     dependency...) back to -common/-core since it has the above new feature and
     otherwise it may get confusing what is what.
 
-  * pdfium-3050.tar.bz2, debian/copyright, debian/source/include-binaries:
-    include pdfium
+  * tarballs/pdfium-3050.tar.bz2, debian/copyright,
+    debian/source/include-binaries: include pdfium
+
+  * debian/rules, debian/source/include-binaries:
+    - temporarily use internal cppunit; LO now wants >= 0.14
 
  -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 
diff --git a/control b/control
index baa4ac0..a1aded2 100644
--- a/control
+++ b/control
@@ -55,7 +55,6 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libclucene-dev (>= 2.3.3.4-4.1),
                libcmis-dev (>= 0.5.0-3),
                libcollada2gltfconvert-dev (>= 20140924-2)[amd64 i386],
-               libcppunit-dev (>= 1.13.2-2.1),
                libcups2-dev,
                libcurl4-gnutls-dev,
                libdbus-glib-1-dev (>= 0.70),
diff --git a/rules b/rules
index d70b493..8ed5851 100755
--- a/rules
+++ b/rules
@@ -397,12 +397,8 @@ SYSTEM_STUFF += graphite
 SYSTEM_STUFF += harfbuzz
 ALLOC=system
 SYSTEM_STUFF += libexttextcat
-SYSTEM_STUFF += cppunit
-ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 5 && echo true)" "true"
-CPPUNIT_MINVER=1.13.2-2.1
-else
-CPPUNIT_MINVER=0.12
-endif
+#SYSTEM_STUFF += cppunit
+CPPUNIT_MINVER=0.14
 DEFAULT_IMAGE=galaxy
 IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze breeze_dark
 ENABLE_MYSQLNATIVE=y

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