[libreoffice] 01/01: missing pieces for 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 f60bc2b2b8046e5a7bbd0f4791756d093f6cdebe
Author: Rene Engelhard <rene at debian.org>
Date:   Thu May 4 20:41:13 2017 +0200

    missing pieces for system-cppunit...
---
 control       | 1 +
 copyright     | 4 ----
 rules         | 2 +-
 tests/control | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/control b/control
index 34b36ae..b91aea7 100644
--- a/control
+++ b/control
@@ -56,6 +56,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),
                libcups2-dev,
                libcurl4-gnutls-dev,
                libdbus-glib-1-dev (>= 0.70),
diff --git a/copyright b/copyright
index dd18934..f3d05c3 100644
--- a/copyright
+++ b/copyright
@@ -467,10 +467,6 @@ Copyright: // Copyright 2014-2016 PDFium Authors.
            // Original code copyright 2014 Foxit Software Inc.
 License: BSD
 
-Files: tarballs/*cppunit*
-Copyright: Copyright 2000-2008, Michael Feathers et al.
-License: LGPL-2.1
-
 Files: debian/missing-sources/jquery-3.1.1.js
 Copyright: Copyright jQuery Foundation and other contributors 
 License: MIT
diff --git a/rules b/rules
index 6b7c532..0114530 100755
--- a/rules
+++ b/rules
@@ -397,7 +397,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 breeze breeze_dark
diff --git a/tests/control b/tests/control
index 41e80bf..f2223c6 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