[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-2-20-gb38173f
The following commit has been merged in the master branch:
commit d169a954826a114e291cea85c791ead72730b179
Author: Rene Engelhard <rene@debian.org>
Date: Fri Feb 3 20:31:43 2012 +0100
replace oor:fuse by oor:replace for -wiki-publishers config
diff --git a/changelog b/changelog
index 5e45ae5..b5f5a18 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
+ * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace
+ for -wiki-publishers config (hopefully closes: #616011)
+
* debian/rules:
- install full changelog only for packages with the same name in OOo
times; strip pre-libreoffice entries otherwise.
@@ -10,7 +13,7 @@ libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
* debian/libreoffice-sdbc-postgresql.preinst.in: cleanup to avoid dpkg
warnings, thanks Julian Gilbey (closes: #657530)
- -- Rene Engelhard <rene@debian.org> Sun, 29 Jan 2012 17:28:30 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 03 Feb 2012 20:26:27 +0100
libreoffice (1:3.4.5-2) unstable; urgency=low
diff --git a/patches/mediwiki-oor-replace.diff b/patches/mediwiki-oor-replace.diff
new file mode 100644
index 0000000..d10d868
--- /dev/null
+++ b/patches/mediwiki-oor-replace.diff
@@ -0,0 +1,89 @@
+--- /dev/null 2012-01-21 20:23:42.859711226 +0100
++++ libreoffice-3.4.5/libreoffice-build/patches/hotfixes/mediwiki-oor-replace.diff 2012-02-03 20:04:52.000000000 +0100
+@@ -0,0 +1,86 @@
++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 6888448..c41aee6 100644
++--- swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++++ swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
++@@ -27,12 +27,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 5ae52ce..ecc89d4 100644
++--- swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++++ swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
++@@ -27,9 +27,9 @@
++ ************************************************************************ -->
++ <oor:component-data oor:name="OptionsDialog" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry";>
++ <node oor:name="Nodes">
++- <node oor:name="Internet" oor:op="fuse">
+++ <node oor:name="Internet" oor:op="replace">
++ <node oor:name="Leaves">
++- <node oor:name="com.sun.star.wiki.options" oor:op="fuse">
+++ <node oor:name="com.sun.star.wiki.options" oor:op="replace">
++ <prop oor:name="Id">
++ <value>com.sun.wiki-publisher</value>
++ </prop>
++diff --git a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
++index e39bbc7..ab10cd7 100644
++--- swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
+++++ swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
++@@ -27,9 +27,9 @@
++ ************************************************************************ -->
++ <oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:name="Paths" oor:package="org.openoffice.Office">
++ <node oor:name="Paths">
++- <node oor:name="Template" oor:op="fuse">
+++ <node oor:name="Template" oor:op="replace">
++ <node oor:name="InternalPaths">
++- <node oor:name="%origin%/templates" oor:op="fuse"/>
+++ <node oor:name="%origin%/templates" oor:op="replace"/>
++ </node>
++ </node>
++ </node>
++diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
++index d0ddad5..9c8b6b3 100644
++--- swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++++ swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
++@@ -28,7 +28,7 @@
++ <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
++ <oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:package="org.openoffice.TypeDetection" oor:name="Filter">
++ <node oor:name="Filters">
++- <node oor:name="MediaWiki" oor:op="fuse">
+++ <node oor:name="MediaWiki" oor:op="replace">
++ <prop oor:name="FileFormatVersion"><value>0</value></prop>
++ <prop oor:name="Type"><value>MediaWiki</value></prop>
++ <prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
++@@ -40,7 +40,7 @@
++ </prop>
++ <prop oor:name="Flags"><value>EXPORT ALIEN 3RDPARTYFILTER</value></prop>
++ </node>
++- <node oor:name="MediaWiki_Web" oor:op="fuse">
+++ <node oor:name="MediaWiki_Web" oor:op="replace">
++ <prop oor:name="FileFormatVersion"><value>0</value></prop>
++ <prop oor:name="Type"><value>MediaWiki</value></prop>
++ <prop oor:name="DocumentService"><value>com.sun.star.text.WebDocument</value></prop>
++diff --git a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
++index 64031b8..e6739c9 100644
++--- swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
+++++ swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
++@@ -28,7 +28,7 @@
++ <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
++ <oor:component-data xmlns:oor="http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:package="org.openoffice.TypeDetection" oor:name="Types">
++ <node oor:name="Types">
++- <node oor:name="MediaWiki" oor:op="fuse">
+++ <node oor:name="MediaWiki" oor:op="replace">
++ <prop oor:name="DetectService"><value>com.sun.star.comp.filters.XMLFilterDetect</value></prop>
++ <prop oor:name="URLPattern"/>
++ <prop oor:name="Extensions"><value>txt</value></prop>
diff --git a/patches/series b/patches/series
index fcd41d2..2278282 100644
--- a/patches/series
+++ b/patches/series
@@ -24,3 +24,4 @@ update-libreoffice.1.diff
wordml2ooo_draw.xsl-add-missing-include.diff
add-debian-multiarch-support.diff
jdbc-driver-threading.diff
+mediwiki-oor-replace.diff
--
LibreOffice packaging repository
Reply to: