[libreoffice] 02/03: cppunit 1.14 is in experimental now; use system-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 e8d21c62ca946a7581ca375a61cc77db7992ad2b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Wed Jun 7 19:42:53 2017 +0000

    cppunit 1.14 is in experimental now; use system-cppunit
---
 control                 | 1 +
 copyright               | 4 ----
 rules                   | 2 +-
 source/include-binaries | 1 -
 tests/control           | 2 +-
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/control b/control
index 07832b1..0b5bdd8 100644
--- a/control
+++ b/control
@@ -57,6 +57,7 @@ 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.14) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
                libcups2-dev,
                libcurl4-gnutls-dev,
                libdbus-glib-1-dev (>= 0.70),
diff --git a/copyright b/copyright
index 6a9767b..436bbaa 100644
--- a/copyright
+++ b/copyright
@@ -471,7 +471,3 @@ Files: debian/missing-sources/jquery-3.1.1.js
 Copyright: Copyright jQuery Foundation and other contributors 
 License: MIT
 
-Files: tarballs/*cppunit*
-Copyright: Copyright 2000-2008, Michael Feathers et al.
-License: LGPL-2.1
-
diff --git a/rules b/rules
index 2492178..5524522 100755
--- a/rules
+++ b/rules
@@ -413,7 +413,7 @@ SYSTEM_STUFF += graphite
 SYSTEM_STUFF += harfbuzz
 ALLOC=system
 SYSTEM_STUFF += libexttextcat
-#SYSTEM_STUFF += cppunit
+SYSTEM_STUFF += cppunit
 CPPUNIT_MINVER=1.14
 DEFAULT_IMAGE=galaxy
 IMAGES:="$(DEFAULT_IMAGE) hicontrast oxygen tango sifr sifr_dark breeze breeze_dark"
diff --git a/source/include-binaries b/source/include-binaries
index 6f19755..1cbc71c 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -6,4 +6,3 @@ tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/xmlsec1-1.2.24.tar.gz
 tarballs/pdfium-3064.tar.bz2
-tarballs/cppunit-1.14.0.tar.gz
diff --git a/tests/control b/tests/control
index c167b57..ffdfe36 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