[libreoffice] 01/01: debian/patches/mediawiki-oor-replace.diff: back to ="fuse" for Paths.xcu (closes: #867209)
Rene Engelhard
rene at moszumanska.debian.org
Tue Jul 11 20:31:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 60cd27118a50e689078018367895177ea0c22504
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 | 5 ++++-
control | 1 +
control.in | 3 ++-
patches/mediwiki-oor-replace.diff | 16 ----------------
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/changelog b/changelog
index 445a548..a25fb7d 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,9 @@ libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
with ICU 59 (this only affects some internal libs, but...)
* debian/patches/sdk-cat-sed-bin.diff: fix bin/distro-install-sdk;
cat and sed are in /bin... How did this ever work?
+ * 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/rules:
- clean up JRE Depends; we consider java6_architectures as Java arch, so
@@ -20,7 +23,7 @@ libreoffice (1:5.3.4-2) UNRELEASED; urgency=medium
test import pyuno while uno-import does import uno (the uichecks do the former).
* debian/test/control: sort by importance
- -- Rene Engelhard <rene at debian.org> Sun, 02 Jul 2017 16:39:51 +0000
+ -- Rene Engelhard <rene at debian.org> Tue, 11 Jul 2017 20:52:21 +0200
libreoffice (1:5.3.4-1) unstable; urgency=medium
diff --git a/control b/control
index 01835bb..56c3254 100644
--- a/control
+++ b/control
@@ -456,6 +456,7 @@ Conflicts: broffice,
libreoffice-filter-mobiledev,
libreoffice-l10n-4.3,
libreoffice-l10n-4.4,
+ libreoffice-wiki-publisher (<< 1.2.0+LibO5.3.4-2),
openoffice-unbundled
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
diff --git a/control.in b/control.in
index ad3eb32..7be16b6 100644
--- a/control.in
+++ b/control.in
@@ -291,7 +291,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.3.4-2)
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
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
More information about the Pkg-openoffice-commits
mailing list