[SCM] LibreOffice packaging repository branch, master, updated. cf2899adddfd3cc1eefa369e329f4119bf09deb4
The following commit has been merged in the master branch:
commit 5ed7a371b0e0e515bbe40dbd92b4c3b9f1ffb9b6
Author: Rene Engelhard <rene@debian.org>
Date: Sat Feb 19 18:29:21 2011 +0000
s/openoffice.org/libreoffice/ for javaldx (closes: #614103)
diff --git a/changelog b/changelog
index 71d2561..ec06b0a 100644
--- a/changelog
+++ b/changelog
@@ -2,12 +2,14 @@ libreoffice (1:3.3.1~rc2-2) UNRELEASED; urgency=low
* debian/patches/arm-optimization: add explicit support for
optimization for armv4t/6/7, based on i117017
+ * debian/patches/javaldx-LibreOffice.diff: s/openoffice.org/libreoffice/
+ for javaldx (closes: #614103)
* debian/rules:
- --with-arm-target=7 on armhf, explicit --with-arm-target=4
(armv4t) for armel
- -- Rene Engelhard <rene@debian.org> Sat, 19 Feb 2011 17:48:57 +0100
+ -- Rene Engelhard <rene@debian.org> Sat, 19 Feb 2011 18:26:49 +0000
libreoffice (1:3.3.1~rc2-1) unstable; urgency=low
diff --git a/patches/javaldx-LibreOffice.diff b/patches/javaldx-LibreOffice.diff
new file mode 100644
index 0000000..4285373
--- /dev/null
+++ b/patches/javaldx-LibreOffice.diff
@@ -0,0 +1,14 @@
+--- libreoffice-3.3.1/libreoffice-build/patches/dev300/ubuntu-javaldx.diff-old 2011-02-19 18:24:07.000000000 +0000
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/ubuntu-javaldx.diff 2011-02-19 18:24:29.000000000 +0000
+@@ -4,9 +4,9 @@
+ if (errcode == JFW_E_NO_JAVA_FOUND)
+ {
+ fprintf(stderr,"javaldx: Could not find a Java Runtime Environment! \n");
+-+ fprintf(stderr,"Please ensure that a JVM and the package openoffice.org-java-common\n");
+++ fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n");
+ + fprintf(stderr,"is installed.\n");
+-+ fprintf(stderr,"If it is already installed then try removing ~/.openoffice.org/3/user/config/javasettings_Linux_*.xml\n");
+++ fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
+ return false;
+ }
+ else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
diff --git a/patches/series b/patches/series
index e179057..d0c08a4 100644
--- a/patches/series
+++ b/patches/series
@@ -6,3 +6,4 @@ do-not-switch-workspaces-of-wm.diff
bridges-mkstemp-error-better-message.diff
pyuno-demo-fix-PYTHONPATH.diff
arm-optimization.diff
+javaldx-LibreOffice.diff
--
LibreOffice packaging repository
Reply to: