[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-1-26-g742508d
The following commit has been merged in the debian-experimental-3.5 branch:
commit 62ef474aa0f4e5518988ba0ace83040c32b9afcc
Author: Rene Engelhard <rene@debian.org>
Date: Sun Sep 11 16:00:38 2011 +0200
oosplash-javaldx-path.diff is committed upstream
diff --git a/patches/oosplash-javaldx-path.diff b/patches/oosplash-javaldx-path.diff
deleted file mode 100644
index 2811c8c..0000000
--- a/patches/oosplash-javaldx-path.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- /dev/null 2011-08-29 23:15:17.488532555 +0000
-+++ libreoffice-3.4.3/libreoffice-build/patches/hotfixes/oosplash-javaldx-path.diff 2011-08-31 08:09:12.000000000 +0000
-@@ -0,0 +1,13 @@
-+diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
-+index 85e2e28..2a9c923 100755
-+--- desktop/unx/source/start.c
-++++ desktop/unx/source/start.c
-+@@ -845,7 +845,7 @@ exec_javaldx (Args *args)
-+ rtl_uString_newFromAscii( &pApp, "file://" );
-+ rtl_uString_newConcat( &pApp, pApp, args->pAppPath );
-+ pTmp = NULL;
-+- rtl_uString_newFromAscii( &pTmp, "/../ure/bin/javaldx" );
-++ rtl_uString_newFromAscii( &pTmp, "/../basis-link/ure-link/bin/javaldx" );
-+ rtl_uString_newConcat( &pApp, pApp, pTmp );
-+ rtl_uString_release( pTmp );
-+
diff --git a/patches/series b/patches/series
index 07ed6a2..c2695a3 100644
--- a/patches/series
+++ b/patches/series
@@ -16,6 +16,5 @@ libebook-1.2.so.11.diff
vbaobj-visibility-fix.diff
make-gengal-work-again.diff
mipsel-jfw-plugin-arch.diff
-oosplash-javaldx-path.diff
no-deprecated-options-in-qstart-wrappers.diff
update-sdbc-postgresql.diff
--
LibreOffice packaging repository
Reply to: