[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.4_rc1-1-107-geaa8760
The following commit has been merged in the debian-experimental-3.7 branch:
commit a5c059da725da1673bedfa2cdf2b74700687676e
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 15 21:26:36 2012 +0100
git update; remove obsolete ure-no-etc-opt-ure.diff
diff --git a/changelog b/changelog
index 02c1198..aada87c 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:4.0.0~alpha0~git20121114-1) UNRELEASED; urgency=low
+libreoffice (1:4.0.0~alpha0~git20121115-1) UNRELEASED; urgency=low
* new upstream snapshot
- contains new driver for mozab (mork). Automatically enabled thus
diff --git a/patches/series b/patches/series
index f865cb4..bf9e395 100644
--- a/patches/series
+++ b/patches/series
@@ -25,5 +25,4 @@ py3uno-module.diff
ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
disable-flaky-unoapi-tests.diff
-ure-no-etc-opt-ure.diff
dont-touch-urd.diff
diff --git a/patches/ure-no-etc-opt-ure.diff b/patches/ure-no-etc-opt-ure.diff
deleted file mode 100644
index f015c90..0000000
--- a/patches/ure-no-etc-opt-ure.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/ure/source/jvmfwk3rc b/ure/source/jvmfwk3rc
-index d1f79c5..c002f0e 100644
---- a/ure/source/jvmfwk3rc
-+++ b/ure/source/jvmfwk3rc
-@@ -17,6 +17,6 @@
- #
- [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
Reply to: