[libreoffice] 01/01: debian/patches/disable-mediaembedding-test.diff: remove, GTK3 is now disabled
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 68a5b6c0bcc0bc5f4cb5ad66f6714d690366c9b5
Author: Rene Engelhard <rene@debian.org>
Date: Thu Sep 17 18:05:48 2015 +0200
debian/patches/disable-mediaembedding-test.diff: remove, GTK3 is now disabled
---
changelog | 5 ++++-
patches/disable-mediaembedding-test.diff | 37 --------------------------------
patches/series | 1 -
3 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/changelog b/changelog
index cb8c2f3..8414b20 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
libreoffice (1:5.0.1-2) unstable; urgency=medium
+ * debian/patches/series, debian/patches/disable-mediaembedding-test.diff:
+ remove, GTK3 is now disabled
+
* debian/rules:
- disable gtk3 for now again, too shaky
(closes: #799251, #799049, #795131)
@@ -9,7 +12,7 @@ libreoffice (1:5.0.1-2) unstable; urgency=medium
* debian/control.in:
- add Chris Halls <halls@debian.org> back to Uploaders:
- -- Rene Engelhard <rene@debian.org> Thu, 17 Sep 2015 12:35:30 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 17 Sep 2015 13:52:16 +0200
libreoffice (1:5.0.1-1) unstable; urgency=medium
diff --git a/patches/disable-mediaembedding-test.diff b/patches/disable-mediaembedding-test.diff
deleted file mode 100644
index 2985d83..0000000
--- a/patches/disable-mediaembedding-test.diff
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/sd/qa/unit/export-tests.cxx 2015-06-20 11:49:52.000000000 +0200
-+++ b/sd/qa/unit/export-tests.cxx 2015-06-20 18:40:25.797612229 +0200
-@@ -81,7 +81,7 @@
- void testBnc870233_2();
- void testN828390_4();
- void testN828390_5();
-- void testMediaEmbedding();
-+// void testMediaEmbedding();
- void testFdo71961();
- void testFdo84043();
- void testN828390();
-@@ -115,7 +115,7 @@
- CPPUNIT_TEST(testBnc870233_2);
- CPPUNIT_TEST(testN828390_4);
- CPPUNIT_TEST(testN828390_5);
-- CPPUNIT_TEST(testMediaEmbedding);
-+// CPPUNIT_TEST(testMediaEmbedding);
- CPPUNIT_TEST(testFdo71961);
- CPPUNIT_TEST(testFdo84043);
- CPPUNIT_TEST(testN828390);
-@@ -336,6 +336,7 @@
- xDocShRef->DoClose();
- }
-
-+/*
- void SdExportTest::testMediaEmbedding()
- {
- ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), ODP);
-@@ -370,7 +371,7 @@
-
- xDocShRef->DoClose();
- }
--
-+*/
- void SdExportTest::testFdo84043()
- {
- ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/fdo84043.odp"), ODP);
diff --git a/patches/series b/patches/series
index 51d1d7c..4e34133 100644
--- a/patches/series
+++ b/patches/series
@@ -29,7 +29,6 @@ hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
liborcus-0.9.1.diff
-disable-tiledrendering-test.diff
gtk3-rtl.diff
kde4-rtl.diff
795131.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: