[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-3-98-gc7ce3fb
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 8f225eafa4a026e4381df12e7a13783326ea2750
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 1 12:43:05 2011 +0200
prevent-oosplash-smoketest-hangs.diff is upstream
diff --git a/patches/prevent-oosplash-smoketest-hangs.diff b/patches/prevent-oosplash-smoketest-hangs.diff
deleted file mode 100644
index c4f3e11..0000000
--- a/patches/prevent-oosplash-smoketest-hangs.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- /dev/null 2011-06-02 14:58:12.448567841 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/prevent-oosplash-smoketest-hangs.diff 2011-05-31 13:04:33.000000000 +0000
-@@ -0,0 +1,21 @@
-+From c414bb1dc75b3db4fa88874ff5f978e6a0d18d56 Mon Sep 17 00:00:00 2001
-+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-+Date: Tue, 31 May 2011 12:58:48 +0000
-+Subject: use --nologo to prevent oosplash smoketest hangs
-+
-+---
-+diff --git a/test/source/cpp/officeconnection.cxx b/test/source/cpp/officeconnection.cxx
-+index 9bdddca..9225411 100644
-+--- test/source/cpp/officeconnection.cxx
-++++ test/source/cpp/officeconnection.cxx
-+@@ -76,7 +76,7 @@ void OfficeConnection::setUp() {
-+ RTL_CONSTASCII_USTRINGPARAM("--nofirststartwizard"));
-+ rtl::OUString norestoreArg(RTL_CONSTASCII_USTRINGPARAM("--norestore"));
-+ //Disable use of the unix standalone splash screen app for the tests
-+- rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--no-oosplash"));
-++ rtl::OUString noSplashArg(RTL_CONSTASCII_USTRINGPARAM("--nologo"));
-+ rtl::OUString acceptArg(
-+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("--accept=")) + desc +
-+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";urp")));
-+--
-+cgit v0.8.3-6-g21f6
---- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-14 22:11:27.000000000 +0000
-+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-14 22:11:50.000000000 +0000
-@@ -359,6 +359,7 @@
- #autodoc-add-missing-stdio-h.diff, rengelha
-
- fix-connectivity-tests-with-system-hsqldb.diff
-+prevent-oosplash-smoketest-hangs.diff
-
- [ DebianOnly ]
- open-url-support-iceanimals.diff
diff --git a/patches/series b/patches/series
index b94954f..5589008 100644
--- a/patches/series
+++ b/patches/series
@@ -5,7 +5,6 @@ update-debian-opt.diff
gcc4.6.0.diff
odk-jni-include.diff
disable-sdbc-postgresql.diff
-prevent-oosplash-smoketest-hangs.diff
disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
packcomponents-remove-split-components.diff
--
LibreOffice packaging repository
Reply to: