[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.2-2-28-g4ebb1b4
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 5dd8acbd4a77687a3bf23c87af83500c8f2584f0
Author: Rene Engelhard <rene@debian.org>
Date: Wed Aug 31 10:18:28 2011 +0200
fix javaldx path in oosplash
diff --git a/changelog b/changelog
index 0f094a5..f7079d2 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ libreoffice (1:3.4.3-1) UNRELEASED; urgency=low
* debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
* debian/patches/mipsel-jfw-plugin-arch.diff: fix JFW_PLUGIN_ARCH
(s/mips32/mipsel/) in jvmfwk for mipsel, thanks Aurelien Jarno
+ * debian/patches/oosplash-javaldx-path.diff: fix javaldx path in oosplash
+ (closes: #637829)
+
* debian/rules:
- try build with openjdk on mipsel again now that jvmfwk knows the
correct arch
@@ -13,7 +16,7 @@ libreoffice (1:3.4.3-1) UNRELEASED; urgency=low
- adapt for /usr/lib/jvm/java-6-openjdk -> /usr/lib/jvm/java-6-openjdk-$ARCH
move in OpenJDK
- -- Rene Engelhard <rene@debian.org> Tue, 30 Aug 2011 12:46:43 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 31 Aug 2011 08:10:59 +0000
libreoffice (1:3.4.2-2) experimental; urgency=low
diff --git a/patches/oosplash-javaldx-path.diff b/patches/oosplash-javaldx-path.diff
new file mode 100644
index 0000000..2811c8c
--- /dev/null
+++ b/patches/oosplash-javaldx-path.diff
@@ -0,0 +1,16 @@
+--- /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 9be3808..bf3a07f 100644
--- a/patches/series
+++ b/patches/series
@@ -21,3 +21,4 @@ fix-distro-config.diff
#fdo35784.diff
#sdbc-postgresql-obsolete-hash-map.diff
mipsel-jfw-plugin-arch.diff
+oosplash-javaldx-path.diff
--
LibreOffice packaging repository
Reply to: