[libreoffice] 01/01: git update; make disable-some-sc-tests-with-internal-cppunit.diff apply again (and fix changelog)

[Rene Engelhard]

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

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

commit 3f7186dd986063b11bd49ff8d0ad5f9aff43770b
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Dec 4 21:22:16 2017 +0100

    git update; make disable-some-sc-tests-with-internal-cppunit.diff apply again (and fix changelog)
---
 changelog                                                | 6 +++++-
 control                                                  | 2 +-
 patches/disable-some-sc-tests-with-internal-cppunit.diff | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index 3a3fb3e..2aa3c42 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:6.0.0~beta2~git20171130-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta2~git20171208-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
 
   * debian/patches/apparmor-complain.diff: set complain mode for oosplash
     and soffice.bin profiles
@@ -17,6 +19,8 @@ libreoffice (1:6.0.0~beta2~git20171130-1) UNRELEASED; urgency=medium
       /etc/fonts.d/30_opensymbol.conf
   * debian/libreoffice-common.bug-script.in: run aa-status
 
+ -- Rene Engelhard <rene at debian.org>  Mon, 04 Dec 2017 19:01:27 +0100
+
 libreoffice (1:6.0.0~beta1-2) experimental; urgency=medium
 
   * debian/libreoffice-common.{triggers,postinst}.in,
diff --git a/control b/control
index 0903eba..2895d20 100644
--- a/control
+++ b/control
@@ -188,7 +188,7 @@ Build-Conflicts: amd-libopencl1,
 Standards-Version: 4.0.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-6.0
 Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
-Bugs: 
+Bugs: mailto:debian-openoffice at lists.debian.org
 Homepage: http://www.libreoffice.org
 
 Package: libreoffice
diff --git a/patches/disable-some-sc-tests-with-internal-cppunit.diff b/patches/disable-some-sc-tests-with-internal-cppunit.diff
index 70e1036..e56e7e7 100644
--- a/patches/disable-some-sc-tests-with-internal-cppunit.diff
+++ b/patches/disable-some-sc-tests-with-internal-cppunit.diff
@@ -23,8 +23,8 @@ index 338ad5cdf609..ce60c12de35e 100644
  	CppunitTest_sc_filters_test \
  	CppunitTest_sc_rangelst_test \
 @@ -58,13 +58,20 @@ endif
- 
  $(eval $(call gb_Module_add_slowcheck_targets,sc, \
+ 	CppunitTest_sc_cond_format_merge \
  	CppunitTest_sc_new_cond_format_api \
 -	CppunitTest_sc_subsequent_filters_test \
  	CppunitTest_sc_subsequent_export_test \

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