[libreoffice] 01/01: git update; add libepubgen conditional

[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 2bcc9f107ca88c4c9383d8341d6bfa44bccf0074
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Aug 6 13:35:18 2017 +0200

    git update; add libepubgen conditional
---
 changelog                                                | 2 +-
 control                                                  | 3 ++-
 patches/disable-some-sc-tests-with-internal-cppunit.diff | 9 ++++-----
 rules                                                    | 4 ++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index 7eaa306..78b838d 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170729-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170806-1) UNRELEASED; urgency=medium
 
   [ Rene Engelhard ]
   * New upstream snapshot
diff --git a/control b/control
index 7eff2a6..280a0b6 100644
--- a/control
+++ b/control
@@ -68,6 +68,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libebook1.2-dev,
                libeot-dev,
                libepoxy-dev (>= 1.2),
+               libepubgen-dev,
                libetonyek-dev,
                libexpat1-dev,
                libexttextcat-dev (>= 3.4.1),
@@ -197,7 +198,7 @@ Build-Conflicts: amd-libopencl1,
 Standards-Version: 4.0.0
 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 37bfd72..443ea86 100644
--- a/patches/disable-some-sc-tests-with-internal-cppunit.diff
+++ b/patches/disable-some-sc-tests-with-internal-cppunit.diff
@@ -22,7 +22,7 @@ index 338ad5cdf609..ce60c12de35e 100644
  	CppunitTest_sc_bugfix_test \
  	CppunitTest_sc_filters_test \
  	CppunitTest_sc_rangelst_test \
-@@ -56,13 +54,20 @@ endif
+@@ -56,12 +56,19 @@ endif
  $(eval $(call gb_Module_add_slowcheck_targets,sc, \
  	CppunitTest_sc_condformats \
  	CppunitTest_sc_new_cond_format_api \
@@ -30,14 +30,13 @@ index 338ad5cdf609..ce60c12de35e 100644
  	CppunitTest_sc_subsequent_export_test \
  	CppunitTest_sc_html_export_test \
  	CppunitTest_sc_copypaste \
- 	CppunitTest_sc_dataproviders_test \
  ))
  
 +ifeq ($(SYSTEM_CPPUNIT),TRUE)
 +$(eval $(call gb_Module_add_slowcheck_targets,sc, \
-+	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
-+		CppunitTest_sc_ucalc) \
-+	CppunitTest_sc_subsequent_filters_test \
++       $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
++               CppunitTest_sc_ucalc) \
++       CppunitTest_sc_subsequent_filters_test \
 +))
 +endif
 +
diff --git a/rules b/rules
index c71c8c0..9ba0725 100755
--- a/rules
+++ b/rules
@@ -175,6 +175,7 @@ SYSTEM_STUFF += libcdr
 SYSTEM_STUFF += libmspub
 SYSTEM_STUFF += libmwaw
 SYSTEM_STUFF += libodfgen
+SYSTEM_STUFF += libepubgen
 SYSTEM_STUFF += libetonyek
 SYSTEM_STUFF += libfreehand
 # this is libe-book, NOT evolutions libebook (which is
@@ -1221,6 +1222,9 @@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
   ifneq (,$(filter libodfgen, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libodfgen-dev (>= 0.1)
   endif
+  ifneq (,$(filter libepubgen, $(SYSTEM_STUFF)))
+	BUILD_DEPS += , libepubgen-dev
+  endif
   ifneq (,$(filter libetonyek, $(SYSTEM_STUFF)))
 	BUILD_DEPS += , libetonyek-dev
   endif

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