[libreoffice] 05/06: also update mediawiki-oor-replace.diff...

[Rene Engelhard]

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

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

commit 366f564d4e69a970d4289ea7035bd787f9720c7f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Mar 27 15:17:39 2017 +0200

    also update mediawiki-oor-replace.diff...
---
 changelog                         |  1 +
 patches/mediwiki-oor-replace.diff | 12 ++++++------
 patches/series                    |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index fa5ce04..6b57391 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,7 @@ libreoffice (1:5.3.2~rc1-1) UNRELEASED; urgency=medium
 
   * debian/patches/help-msg-add-package-info.diff,
     debian/patches/mention-java-common-package.diff,
+    debian/patches/mediawiki-oor-replace.diff:
     debian/patches/series: actually update the patches and re-enable...
 
   * debian/rules:
diff --git a/patches/mediwiki-oor-replace.diff b/patches/mediwiki-oor-replace.diff
index 9d3e75a..18c4fa2 100644
--- a/patches/mediwiki-oor-replace.diff
+++ b/patches/mediwiki-oor-replace.diff
@@ -1,5 +1,5 @@
 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
+index 2b35ced08f31..0c96070dd4f0 100644
 --- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
 +++ b/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
 @@ -18,9 +18,9 @@
@@ -15,7 +15,7 @@ index 2b35ced..0c96070 100644
                          <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 01763bf..fe18a9c 100644
+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 @@
@@ -31,11 +31,11 @@ index 01763bf..fe18a9c 100644
          </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 a37369a..240be99 100644
+index 3309b503824c..261e470b253b 100644
 --- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
 +++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
 @@ -19,7 +19,7 @@
- <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
+ <!DOCTYPE oor:component-data SYSTEM "../../../../../../../../officecfg/registry/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">
@@ -53,11 +53,11 @@ index a37369a..240be99 100644
                  <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 8c864a3..6e31afc 100644
+index 15e4f850041a..ce7cd0763b79 100644
 --- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
 +++ b/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
 @@ -19,7 +19,7 @@
- <!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
+ <!DOCTYPE oor:component-data SYSTEM "../../../../../../../../officecfg/registry/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">
diff --git a/patches/series b/patches/series
index ae8c6bd..d9811fc 100644
--- a/patches/series
+++ b/patches/series
@@ -13,7 +13,7 @@ jdbc-driver-classpaths.diff
 mysqlcppconn-libmysqlclient-SONAME.diff
 #search-usr-share-for-images.diff
 make-package-modules-not-suck.diff
-#mediwiki-oor-replace.diff
+mediwiki-oor-replace.diff
 debian-hardened-buildflags-CPPFLAGS.diff
 disable-flaky-tests.diff
 #dont-touch-urd.diff

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