[libreoffice] 01/01: start with beta2; remove upstream check-for-dejavu.diff

[Rene Engelhard]

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

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

commit 43265c0bf0583b19d0945efb1dd1b1b53f72b91e
Author: Rene Engelhard <rene at debian.org>
Date:   Mon May 29 08:20:02 2017 +0200

    start with beta2; remove upstream check-for-dejavu.diff
---
 changelog                     |  4 +--
 patches/check-for-dejavu.diff | 60 -------------------------------------------
 patches/series                |  1 -
 3 files changed, 2 insertions(+), 63 deletions(-)

diff --git a/changelog b/changelog
index 8cfabdd..cddd216 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,6 @@
-libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.0~beta2~git20170529-1) UNRELEASED; urgency=medium
 
-  * New upstream beta release
+  * New upstream snapshot
     - is now able to do "insert->image, choose pdf". Not insert->docunent
       but close enough, so this closes: #814598
       (unfortunately only using internal pdfium. sigh.)
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/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

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