[libreoffice] 01/01: fix changelog

Sat May 27 10:08:13 UTC 2017

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 0fbc6d91f67d7cb69658a06fd7c51ae330b00ba0
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat May 27 12:08:08 2017 +0200

    fix changelog
---
 changelog               | 16 +++++++---------
 control                 |  3 +--
 copyright               |  5 +++++
 rules                   |  2 +-
 source/include-binaries |  1 +
 tests/control           |  2 +-
 6 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/changelog b/changelog
index 72331ce..40ec992 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~beta1-1) experimental; urgency=medium
 
   * New upstream beta release
     - is now able to do "insert->image, choose pdf". Not insert->docunent
@@ -18,20 +18,18 @@ libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
   * tarballs/pdfium-3064.tar.bz2, debian/copyright,
     debian/source/include-binaries: include pdfium
 
-  * debian/rules:
-    - adapt for (upcoming) usage of dh_missing
-    - run build-nocheck with --without-junit --without-cppunit to configure
-      and run check without them 
-
- -- Rene Engelhard <rene at debian.org>  Thu, 18 May 2017 12:54:08 +0200
-
-libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
+  * tarballs/cppunit-1.14.0.tar.gz, debian/copyright,
+    debian/source/include-binaries, debian/rules: use internal cppunit, we
+    need >= 1.14.0 here and that one is in NEW only yet
 
   * debian/rules:
+    - adapt for (upcoming) usage of dh_missing
     - fix logic error; make -g1 etc work also with noddebs. Build with those
       flags also if building no -dbgsym
     - move DPKG_EXPORT_BUILDFLAGS and buildflags.mk include later to make it
       effective (worked before, but...)
+    - run build-nocheck with --without-junit --without-cppunit to configure
+      and run check without them 
     - fix /usr/share/libreoffice/program/classes/unoil.jar symlink
   * debian/control.in:
     - remove obsolete Pre-Depends
diff --git a/control b/control
index 13270e0..3b0be68 100644
--- a/control
+++ b/control
@@ -57,7 +57,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.14) [!kfreebsd-amd64 !kfreebsd-i386 !sparc64] <!nocheck>,
                libcups2-dev,
                libcurl4-gnutls-dev,
                libdbus-glib-1-dev (>= 0.70),
@@ -191,7 +190,7 @@ Build-Conflicts: amd-libopencl1,
 Standards-Version: 3.9.4
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.3
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs: mailto:debian-openoffice at lists.debian.org
+Bugs: 
 Homepage: http://www.libreoffice.org
 
 Package: libreoffice
diff --git a/copyright b/copyright
index 80a24e7..6a9767b 100644
--- a/copyright
+++ b/copyright
@@ -470,3 +470,8 @@ License: BSD
 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 bff7708..aada64a 100755
--- a/rules
+++ b/rules
@@ -404,7 +404,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/source/include-binaries b/source/include-binaries
index 1cbc71c..6f19755 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -6,3 +6,4 @@ 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 ffdfe36..c167b57 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

