The following commit has been merged in the debian-experimental-3.5 branch:
commit 75f1d72b28c83c36514f631316d1b4438c856509
Author: Rene Engelhard <r...@debian.org>
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 1057a80..27ab036 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,8 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
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:
- use generic python3.pc instead of pythonX.Y(mu).pc
@@ -19,7 +21,7 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
* debian/control.in:
- remove obsolete sharutils, po-debconf and wget | curl build-deps
- -- Rene Engelhard <r...@debian.org> Fri, 19 Oct 2012 10:52:12 +0200
+ -- Rene Engelhard <r...@debian.org> 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 4d783f1..5bd67a7 100644
--- a/patches/series
+++ b/patches/series
@@ -36,3 +36,4 @@ CVE-2012-2665-binfilter.diff
ca-XV-update.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 debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tqloq-00034r...@vasks.debian.org
