The following commit has been merged in the master branch:
commit 72fb453faa678dffb0be82d3c1c60907ffc4bd3d
Author: Rene Engelhard <[email protected]>
Date: Mon Oct 22 19:28:14 2012 +0200
exclude /etc/opt/ure from ure search paths (closes: #677601)
diff --git a/changelog b/changelog
index dc34731..a1f6e71 100644
--- a/changelog
+++ b/changelog
@@ -7,12 +7,14 @@ libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
valgrinding (closes: #690717)
* debian/patches/he-lucida-sans-unicode.diff: Update default Hebrew font
from Lucida Sans to Lucida Sans Unicode, thanks Lior Kaplan
+ * debian/patches/ure-no-etc-opt-ure.diff: exclude /etc/opt/ure from ure
+ search paths (closes: #677601)
* debian/rules:
- exclude .desktop from dh_link call to get absolute symlinks
(closes: #690336)
- -- Rene Engelhard <[email protected]> Fri, 19 Oct 2012 11:24:31 +0200
+ -- Rene Engelhard <[email protected]> Mon, 22 Oct 2012 19:20:07 +0200
libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
diff --git a/patches/series b/patches/series
index 08a4af9..0ce7ee4 100644
--- a/patches/series
+++ b/patches/series
@@ -48,3 +48,4 @@ ca-XV-update.diff
CVE-2012-4233.diff
soffice-bashisms.diff
he-lucida-sans-unicode.diff
+ure-no-etc-opt-ure.diff
diff --git a/patches/ure-no-etc-opt-ure.diff b/patches/ure-no-etc-opt-ure.diff
new file mode 100644
index 0000000..a21a66e
--- /dev/null
+++ b/patches/ure-no-etc-opt-ure.diff
@@ -0,0 +1,23 @@
+diff --git a/ure/source/jvmfwk3rc b/ure/source/jvmfwk3rc
+index d1f79c5..c002f0e 100644
+--- a/ure/source/jvmfwk3rc
++++ b/ure/source/jvmfwk3rc
+@@ -1,5 +1,5 @@
+ [Bootstrap]
+ UNO_JAVA_JFW_VENDOR_SETTINGS=${ORIGIN}/../share/misc/javavendors.xml
+-UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}
file:///etc/opt/ure/javasettings_${_OS}_${_ARCH}.xml
++UNO_JAVA_JFW_SHARED_DATA=${URE_OVERRIDE_JAVA_JFW_SHARED_DATA}
+ UNO_JAVA_JFW_USER_DATA=${URE_OVERRIDE_JAVA_JFW_USER_DATA}
${SYSUSERHOME}/.ure/javasettings_${_OS}_${_ARCH}.xml
+ UNO_JAVA_JFW_CLASSPATH_URLS=${URE_MORE_JAVA_CLASSPATH_URLS}
+diff --git a/ure/source/unorc b/ure/source/unorc
+index 7936432..577669c 100644
+--- a/ure/source/unorc
++++ b/ure/source/unorc
+@@ -19,5 +19,5 @@
+ URE_INTERNAL_LIB_DIR=${ORIGIN}
+ URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java
+ URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
+-UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ?file:///etc/opt/ure/types.rdb
?${SYSUSERHOME}/.ure/types.rdb ${URE_MORE_TYPES}
+-UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb
?file:///etc/opt/ure/services.rdb ?${SYSUSERHOME}/.ure/services.rdb
${URE_MORE_SERVICES}
++UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ?${SYSUSERHOME}/.ure/types.rdb
${URE_MORE_TYPES}
++UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb
?${SYSUSERHOME}/.ure/services.rdb ${URE_MORE_SERVICES}
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
