[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.0.1_rc1-2-8-g8213fcb
The following commit has been merged in the debian-experimental-4.1 branch:
commit cf3621fa890a1908aa116e4387e8f87a24ac991c
Author: Rene Engelhard <rene@debian.org>
Date: Mon Mar 4 23:05:32 2013 +0100
make mediwiki-oor-replace.diff apply again
diff --git a/patches/mediwiki-oor-replace.diff b/patches/mediwiki-oor-replace.diff
index 08f72f5..9d3e75a 100644
--- a/patches/mediwiki-oor-replace.diff
+++ b/patches/mediwiki-oor-replace.diff
@@ -1,22 +1,3 @@
-diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
-index c96e7a8..400416b 100644
---- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
-+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
-@@ -18,12 +18,12 @@
- -->
- <oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="WikiExtension" oor:package="org.openoffice.Office.Custom">
- <node oor:name="SpecialData">
-- <node oor:name="so-wiki.germany.sun.com" oor:op="fuse">
-+ <node oor:name="so-wiki.germany.sun.com" oor:op="replace">
- <prop oor:name="AllowUnknownCertificate">
- <value>true</value>
- </prop>
- <node oor:name="AdditionalLoginArguments">
-- <node oor:name="wpDomain" oor:op="fuse">
-+ <node oor:name="wpDomain" oor:op="replace">
- <prop oor:name="Value">
- <value>sun</value>
- </prop>
diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
index 2b35ced..0c96070 100644
--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
--
LibreOffice packaging repository
Reply to: