[libreoffice] 01/03: git update; tdf108963-test.diff is obsolete

Rene Engelhard rene at moszumanska.debian.org
Thu Oct 19 14:13:23 UTC 2017


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 cb1809355d777e92a0ef5183f66802f35ceefdd8
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Oct 19 13:18:39 2017 +0200

    git update; tdf108963-test.diff is obsolete
---
 changelog                   |  2 +-
 patches/series              |  1 -
 patches/tdf108963-test.diff | 18 ------------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/changelog b/changelog
index 115ea72..40b61f9 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20171015-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20171019-1) UNRELEASED; urgency=medium
 
   [ Rene Engelhard ]
   * New upstream snapshot
diff --git a/patches/series b/patches/series
index f8c44b6..baf4818 100644
--- a/patches/series
+++ b/patches/series
@@ -29,4 +29,3 @@ disable-some-sc-tests-with-internal-cppunit.diff
 cppunit-optional.diff
 disable-unused-test-programs.diff
 ww8export-HAVE_MORE_FONTS.diff
-tdf108963-test.diff
diff --git a/patches/tdf108963-test.diff b/patches/tdf108963-test.diff
deleted file mode 100644
index 1b36e5a..0000000
--- a/patches/tdf108963-test.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-PDF got exported and the text rotated. Somehow we get 40/36, though. But as it
-gets rotated, adapt the values so that the test passes...
-
-diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
-index fecdee085f31..76e44de8427f 100644
---- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
-+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
-@@ -722,8 +722,8 @@ void PdfExportTest::testTdf108963()
-             int nHeight = fTop - fBottom;
-             // This was 37 and 20, i.e. the bounding rectangle was much smaller
-             // as the highlight polygon wasn't rotated.
--            CPPUNIT_ASSERT_EQUAL(42, nWidth);
--            CPPUNIT_ASSERT_EQUAL(39, nHeight);
-+            CPPUNIT_ASSERT_EQUAL(40, nWidth);
-+            CPPUNIT_ASSERT_EQUAL(36, nHeight);
-         }
-     }
- 

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



More information about the Pkg-openoffice-commits mailing list