[libreoffice] 02/02: git update; port sensible-lomua.diff

[Rene Engelhard]

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

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

commit 657d96a726310cc35ee43b92f716b46834ca01ab
Author: Rene Engelhard <rene at debian.org>
Date:   Sat May 27 12:18:12 2017 +0200

    git  update; port sensible-lomua.diff
---
 changelog                     |  2 +-
 patches/check-for-dejavu.diff | 60 -------------------------------------------
 patches/sensible-lomua.diff   |  2 +-
 patches/series                |  1 -
 source/include-binaries       |  2 +-
 5 files changed, 3 insertions(+), 64 deletions(-)

diff --git a/changelog b/changelog
index bf3d630..1ff5f7b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.5.0~alpha0~git20170518-1) UNRELEASED; urgency=medium
+libreoffice (1:5.5.0~alpha0~git20170527-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/check-for-dejavu.diff b/patches/check-for-dejavu.diff
deleted file mode 100644
index 1d5e071..0000000
--- a/patches/check-for-dejavu.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- libreoffice-5.4.0.0.beta1/vcl/qa/cppunit/complextext.cxx	2017-05-18 12:48:14.000000000 +0200
-+++ tmp/libreoffice-5.4.0.0.beta1/vcl/qa/cppunit/complextext.cxx	2017-05-22 15:23:13.668459293 +0200
-@@ -19,6 +19,8 @@
- #include <osl/file.hxx>
- #include <osl/process.h>
- 
-+#include <config_test.h>
-+
- std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
- {
-     rStream << "{ ";
-@@ -41,13 +43,16 @@
- #endif
- 
-     CPPUNIT_TEST_SUITE(VclComplexTextTest);
-+#if !TEST_FONTS_MISSING
-     CPPUNIT_TEST(testArabic);
-+#endif
- #if defined(_WIN32)
-     CPPUNIT_TEST(testTdf95650);
- #endif
-     CPPUNIT_TEST_SUITE_END();
- };
- 
-+#if !TEST_FONTS_MISSING
- void VclComplexTextTest::testArabic()
- {
-     const unsigned char pOneTwoThreeUTF8[] = {
-@@ -121,6 +126,7 @@
-     (void)aRect; (void)aRectRot;
- #endif
- }
-+#endif
- 
- #if defined(_WIN32)
- void VclComplexTextTest::testTdf95650()
---- libreoffice-5.4.0.0.beta1/configure.ac	2017-05-18 12:48:14.000000000 +0200
-+++ tmp/libreoffice-5.4.0.0.beta1/configure.ac	2017-05-22 15:51:26.406507002 +0200
-@@ -11290,7 +11289,8 @@
-     then
-         AC_MSG_RESULT([ok])
-     else
--        AC_MSG_RESULT([unknown ($FONTFILE)])
-+        AC_MSG_WARN([unknown ($FONTFILE)])
-+        add_warning "unknown ($FONTFILE)"
-         TEST_FONTS_MISSING=1
-     fi
- }
-@@ -11315,9 +11315,11 @@
-             TEST_FONTS_MISSING=1
-         else
-             test_font_map 'Calibri' 'Carlito'
-+            test_font_map 'DejaVuSans' 'DejaVuSans'
-             if test ${TEST_FONTS_MISSING} -eq 1
-             then
-                 AC_MSG_WARN([Unknown font mappings - unit tests disabled.])
-+                add_warning "Unknown font mappings - unit tests disabled."
-             fi
-         fi
-     else
diff --git a/patches/sensible-lomua.diff b/patches/sensible-lomua.diff
index 3a54a3a..a48d7f2 100644
--- a/patches/sensible-lomua.diff
+++ b/patches/sensible-lomua.diff
@@ -44,5 +44,5 @@ Index: libreoffice-3.6.2~rc1/shell/source/unix/misc/senddoc.sh
 +esac
 +
  # autodetect mail client from executable name
- case `basename "$MAILER" | sed 's/-.*$//'` in
+ case $(basename "$MAILER" | sed 's/-.*$//') in
  
diff --git a/patches/series b/patches/series
index 6be5018..f7e6525 100644
--- a/patches/series
+++ b/patches/series
@@ -29,6 +29,5 @@ no-packagekit-per-default.diff
 system-officeotron-and-odfvalidator.diff
 no-openssl.diff
 disable-sc_subsequent_filters_test-with-internal-cppunit.diff
-check-for-dejavu.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
diff --git a/source/include-binaries b/source/include-binaries
index 6f19755..ca0b260 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,5 +5,5 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/xmlsec1-1.2.24.tar.gz
-tarballs/pdfium-3064.tar.bz2
+tarballs/pdfium-3094.tar.bz2
 tarballs/cppunit-1.14.0.tar.gz

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