[libreoffice] 01/01: git update; update patches; we need orcus 0.13 now

[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 6483cfb73ab4724bc050c6774045bb07fa7a132d
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Nov 18 21:25:15 2017 +0100

    git update; update patches; we need orcus 0.13 now
---
 changelog                                                | 2 +-
 control                                                  | 2 +-
 patches/disable-flaky-tests.diff                         | 4 ++--
 patches/disable-some-sc-tests-with-internal-cppunit.diff | 3 ++-
 rules                                                    | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index 3a50064..aa63a20 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~beta1~git20171111-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~beta1~git20171118-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/control b/control
index a5e0ae4..94ab27c 100644
--- a/control
+++ b/control
@@ -110,7 +110,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libnspr4-dev,
                libnss3-dev (>= 3.12.3),
                libodfgen-dev (>= 0.1),
-               liborcus-dev (>= 0.12),
+               liborcus-dev (>= 0.13),
                libpagemaker-dev,
                libpng-dev,
                libpoppler-cpp-dev,
diff --git a/patches/disable-flaky-tests.diff b/patches/disable-flaky-tests.diff
index 2840cec..20255b1 100644
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@ -87,7 +87,7 @@ index 54eed4d..78019bd 100644
 -    // check rotation angle
 -    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
 -    // check the first few coordinates of the polygon
--#ifndef MACOSX /* Retina-related rounding rountrip error
+-#ifndef MACOSX /* Retina-related rounding roundtrip error
 -                * hard to smooth out due to the use of string compare
 -                * instead of number */
 -#if !defined(_WIN32)
@@ -111,7 +111,7 @@ index 54eed4d..78019bd 100644
 +//    // check rotation angle
 +//    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
 +//    // check the first few coordinates of the polygon
-+//#ifndef MACOSX /* Retina-related rounding rountrip error
++//#ifndef MACOSX /* Retina-related rounding roundtrip error
 +//                * hard to smooth out due to the use of string compare
 +//                * instead of number */
 +//#if !defined(_WIN32)
diff --git a/patches/disable-some-sc-tests-with-internal-cppunit.diff b/patches/disable-some-sc-tests-with-internal-cppunit.diff
index d97bf42..70e1036 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 \
-@@ -58,12 +58,19 @@ endif
+@@ -58,13 +58,20 @@ endif
  
  $(eval $(call gb_Module_add_slowcheck_targets,sc, \
  	CppunitTest_sc_new_cond_format_api \
@@ -30,6 +30,7 @@ index 338ad5cdf609..ce60c12de35e 100644
  	CppunitTest_sc_subsequent_export_test \
  	CppunitTest_sc_html_export_test \
  	CppunitTest_sc_copypaste \
+ 	CppunitTest_sc_pivottable_filters_test \
  ))
  
 +ifeq ($(SYSTEM_CPPUNIT),TRUE)
diff --git a/rules b/rules
index a6141d6..e002c01 100755
--- a/rules
+++ b/rules
@@ -463,7 +463,7 @@ endif
 FAKEROOT_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/libfakeroot
 SYSTEM_STUFF += liblangtag
 SYSTEM_STUFF += orcus
-LIBORCUS_MINVER=0.12
+LIBORCUS_MINVER=0.13
 USE_UCPP=y
 ifeq "$(USE_UCPP)" "y"
   SYSTEM_STUFF += ucpp

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