[libreoffice] 01/01: debian/patches/mediawiki-oor-replace.diff: back to ="fuse" for Paths.xcu (closes: #867209)

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit 828d37b3f77e4c495ca2f888bc9a0de0d5a1748b
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jul 11 20:53:27 2017 +0200

    debian/patches/mediawiki-oor-replace.diff: back to ="fuse" for Paths.xcu (closes: #867209)
---
 changelog                         |  8 +++++++-
 control                           |  1 +
 control.in                        |  3 ++-
 patches/mediwiki-oor-replace.diff | 16 ----------------
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/changelog b/changelog
index 160174a..38ed559 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@ libreoffice (1:5.4.0~rc2-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate
 
+  * debian/patches/mediawiki-oor-replace.diff: back to ="fuse" for Paths.xcu
+    as otherwise it overwrites Template paths and breaks the python wizards
+    (closes: #867209)
+
   * debian/tests/control, debian/uitest: improve, we can only run the test
     now; remove build-needed
   * debian/tests/control, debian/tests/sdk-examples: move ...
@@ -25,8 +29,10 @@ libreoffice (1:5.4.0~rc2-1) UNRELEASED; urgency=medium
       RUN_MAKE_CHECK=n
     - be consequent and add $(IGNORE_MAKE_CHECK_FAILURES) also to the "extra"
       test runs
+  * debian/control.in:
+    - make -common Conflicts: older mediawikis to go sure
 
- -- Rene Engelhard <rene at debian.org>  Fri, 07 Jul 2017 07:11:40 +0200
+ -- Rene Engelhard <rene at debian.org>  Tue, 11 Jul 2017 20:52:21 +0200
 
 libreoffice (1:5.4.0~rc1-1) experimental; urgency=medium
 
diff --git a/control b/control
index 9b42d3b..d55cffa 100644
--- a/control
+++ b/control
@@ -464,6 +464,7 @@ Conflicts: broffice,
            libreoffice-filter-mobiledev,
            libreoffice-l10n-4.3,
            libreoffice-l10n-4.4,
+           libreoffice-wiki-publisher (<< 1.2.0+LibO5.4.0~rc2),
            openoffice-unbundled
 Provides: libreoffice-l10n-en-us
 Breaks: libreoffice-core (<< 1:${oover}~),
diff --git a/control.in b/control.in
index dd08810..39d5554 100644
--- a/control.in
+++ b/control.in
@@ -292,7 +292,8 @@ Conflicts: openoffice-unbundled,
            broffice,
            libreoffice-filter-mobiledev,
            libreoffice-l10n-4.3,
-           libreoffice-l10n-4.4
+           libreoffice-l10n-4.4,
+           libreoffice-wiki-publisher (<< 1.2.0+LibO5.4.0~rc2)
 Provides: libreoffice-l10n-en-us
 Breaks: libreoffice-core (<< 1:${oover}~),
         libreoffice-help-5.2,
diff --git a/patches/mediwiki-oor-replace.diff b/patches/mediwiki-oor-replace.diff
index 18c4fa2..ed04c91 100644
--- a/patches/mediwiki-oor-replace.diff
+++ b/patches/mediwiki-oor-replace.diff
@@ -14,22 +14,6 @@ index 2b35ced08f31..0c96070dd4f0 100644
                      <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 01763bfd66a7..fe18a9cb4c1c 100644
---- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
-+++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
-@@ -18,9 +18,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 3309b503824c..261e470b253b 100644
 --- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git