The following commit has been merged in the debian-experimental-3.7 branch:
commit 1b6b2bd28a54e1be5a54302b44b7cdd252436ce7
Author: Rene Engelhard <r...@debian.org>
Date: Mon Oct 22 19:43:42 2012 +0200
fix merge (remove upstream patches; update ure-no-etc-opt-ure.diff)
diff --git a/patches/he-lucida-sans-unicode.diff
b/patches/he-lucida-sans-unicode.diff
deleted file mode 100644
index 52a1cab..0000000
--- a/patches/he-lucida-sans-unicode.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu
b/officecfg/registry/data/org/openoffice/VCL.xcu
-index e01d207..6050768 100644
---- a/officecfg/registry/data/org/openoffice/VCL.xcu
-+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
-@@ -187,19 +187,19 @@
- <value>Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany
AMT;Albany;Arial;Nimbus Sans L;Interface
User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans
Serif</value>
- </prop>
- <prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- <prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace">
-- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
-+ <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
- </prop>
- </node>
- <node oor:name="th" oor:op="replace">
diff --git a/patches/series b/patches/series
index 0c3d44d..2018edf 100644
--- a/patches/series
+++ b/patches/series
@@ -26,6 +26,4 @@ ignore-sc_cellrangesbase-fails.diff
build-dont-run-checks.diff
#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
disable-flaky-unoapi-tests.diff
-soffice-bashisms.diff
-he-lucida-sans-unicode.diff
ure-no-etc-opt-ure.diff
diff --git a/patches/soffice-bashisms.diff b/patches/soffice-bashisms.diff
deleted file mode 100644
index 53ec60c..0000000
--- a/patches/soffice-bashisms.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index 7727206..0c3ab6d 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -155,7 +155,7 @@ fi
- # valgrind --log-file=valgrind.log does not work well with
--trace-children=yes
- if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then
- echo "redirecting the standard and the error output to valgrind.log"
-- exec &>valgrind.log
-+ exec > valgrind.log 2>&1
- fi
-
- # oosplash does the rest: forcing pages in, javaldx etc. are
diff --git a/patches/ure-no-etc-opt-ure.diff b/patches/ure-no-etc-opt-ure.diff
index a21a66e..f015c90 100644
--- a/patches/ure-no-etc-opt-ure.diff
+++ b/patches/ure-no-etc-opt-ure.diff
@@ -2,7 +2,8 @@ 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 @@
+@@ -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
--
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/e1tqm1x-0003mm...@vasks.debian.org
