[libreoffice] 02/02: update disable-some-sc-tests-with-internal-cppunit.diff

[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 24bcb899ad12234e0b10cb4f32425a634a7b4ca7
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 29 14:41:38 2017 +0000

    update disable-some-sc-tests-with-internal-cppunit.diff
---
 changelog                                                | 2 +-
 patches/disable-some-sc-tests-with-internal-cppunit.diff | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/changelog b/changelog
index fbee9a7..7eaa306 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170723-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170729-1) UNRELEASED; urgency=medium
 
   [ Rene Engelhard ]
   * New upstream snapshot
diff --git a/patches/disable-some-sc-tests-with-internal-cppunit.diff b/patches/disable-some-sc-tests-with-internal-cppunit.diff
index 3e8b74d..37bfd72 100644
--- a/patches/disable-some-sc-tests-with-internal-cppunit.diff
+++ b/patches/disable-some-sc-tests-with-internal-cppunit.diff
@@ -10,11 +10,11 @@
 # interestingly, this works with system-cppunit...
 
 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
-index ef82147d781b..f737236d40c3 100644
+index 338ad5cdf609..ce60c12de35e 100644
 --- a/sc/Module_sc.mk
 +++ b/sc/Module_sc.mk
-@@ -34,8 +34,6 @@
- 
+@@ -35,8 +35,6 @@ endif
+ ifneq ($(OS),IOS)
  $(eval $(call gb_Module_add_check_targets,sc,\
  	Library_scqahelper \
 -	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
@@ -22,7 +22,7 @@ index ef82147d781b..f737236d40c3 100644
  	CppunitTest_sc_bugfix_test \
  	CppunitTest_sc_filters_test \
  	CppunitTest_sc_rangelst_test \
-@@ -53,12 +53,19 @@ endif
+@@ -56,13 +54,20 @@ endif
  $(eval $(call gb_Module_add_slowcheck_targets,sc, \
  	CppunitTest_sc_condformats \
  	CppunitTest_sc_new_cond_format_api \

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