[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc2-2-28-g9514122



The following commit has been merged in the debian-experimental-3.5 branch:
commit 8625912355d41bd9c7ee8ec0c04a61e1d3ccdc99
Merge: 050425ac9791fca8481601c964e965fd37fef31c b38173fe48ecbe7add5d73c575220edb2c0d83a1
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Feb 4 00:18:02 2012 +0100

    Merge remote branch 'origin/master' into debian-experimental-3.5

diff --combined changelog
index a3847a7,b5f5a18..ed1cb7b
--- a/changelog
+++ b/changelog
@@@ -1,181 -1,58 +1,184 @@@
 -libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
 +libreoffice (1:3.5.0~rc3-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +
 +  * debian/patches/SwTblBoxFormula-destructor.diff: work around link error
 +    on armel by specifying explicit SwTblBoxFormula destructor, thanks
 +    Michael Meeks
 +  * debian/patches/ia64-oox-size.diff: build oox on ia64 with -Os
 +    as otherwise it gets too big to link
 +
 +  * debian/rules:
 +    - give gb_FULLDEPS= to actual make check call, not debian/rules
 +      check
 +    - simplify -dbg/--enable-symbols conditionals
 +    - build with default boost again but add build-dep on g++-4.6 (>= 4.6.2-12)
 +
-  -- Rene Engelhard <rene@debian.org>  Fri, 03 Feb 2012 06:25:46 +0000
++ -- Rene Engelhard <rene@debian.org>  Sat, 04 Feb 2012 00:17:47 +0100
 +
 +libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
  
+   * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace
+     for -wiki-publishers config (hopefully closes: #616011)
+ 
    * debian/rules:
 +    - fix another merge error to really fix patch rule in check 
 +    - enable ca-XV, put into -{l10n,help}-ca
 +
 + -- Rene Engelhard <rene@debian.org>  Sun, 29 Jan 2012 17:00:47 +0100
 +
 +libreoffice (1:3.5.0~rc2-1) experimental; urgency=low
 +
 +  * new upstream release candidate 
 +
 +  * debian/rules:
 +    - fix patch rule in check
 +    - fix merge errors: $(ARCH) -> $(DEB_HOST_ARCH)
      - install full changelog only for packages with the same name in OOo
        times; strip pre-libreoffice entries otherwise.
 -    - enable ca-XV, put into -{l10n,help}-ca
 -    - backport from 3.5: don't add unversioned base-files dependency in base
 -  * ext-sources/ext-sources/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz:
 -    add missing file which should have been in updated .orig-ext-sources..
 -  * debian/libreoffice-sdbc-postgresql.preinst.in: cleanup to avoid dpkg
 -    warnings, thanks Julian Gilbey (closes: #657530)
 +    - (re-)enable -script-provider-js
 +  * debian/libreoffice-common.postrm.in: fix merge:
 +    @OOBRANDDIR@/@OOBASISDIR@ -> @OODIR@ 
  
 - -- Rene Engelhard <rene@debian.org>  Fri, 03 Feb 2012 20:26:27 +0100
 + -- Rene Engelhard <rene@debian.org>  Fri, 27 Jan 2012 09:23:07 +0000
  
 -libreoffice (1:3.4.5-2) unstable; urgency=low
 +libreoffice (1:3.5.0~rc1-1) experimental; urgency=low
  
 +  * new upstream release candidate 
 +
 +  * debian/patches/gbuild-JavaClassSet-honour-JAVAFLAGS.diff: honour
 +    JAVAFLAGS (-source 1.5 -target 1.5)
 +
 +  * debian/rules:
 +    - fix Java stuff in SDK install (don't remove /usr/share/libreoffice/sdk)
 +    - work around smoketest failure; disable base for powerpc(spe)/ppc64 as
 +      for armel
 +    - switch to .xz tarballs, upstream will only provide those...
 +
 +  * merge from ubuntu-precise-3.5:
 +    - reenable junit tests
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 20 Jan 2012 10:19:36 +0000
 +
 +libreoffice (1:3.5.0~beta3-1) experimental; urgency=low
 +
 +  * new upstream beta release
 +
 +  * debian/patches/fix-ARM-detection-in-set-soenv.diff: fix for armhf...
 +  * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
 +    fix armhf build in bridges...
 +  * debian/patches/ppc-fix-soffice.sh.diff: make soffice.sh on ppc correct
    * debian/patches/jdbc-driver-threading.diff: backport fix for
      Attach/Detach-CurrentThread slowness from libreoffice-3-5
      (closes: #644957)
 +
 +  * debian/libreoffice-core.preinst.in:
 +    - rm -f /var/lib/libreoffice/basis3.4/program/services.rdb on upgrade
 +      (and for safety on install, too) (closes: #650341) 
 +  * debian/libreoffice-{common,core}.postrm.in:
 +    - on remove, remove all /var/lib content on remove (prereg/bundled
 +      basisX.Y)
    * debian/rules:
 +    - stop creating a dependency on ure for uno-libs3 in .shlibs, use
 +      uno-libs3 instead
      - specify correct --with-servlet-api= after recent libcommons-logging-java
        changes 
 +  * debian/uno-libs3.symbols:
 +    - use uno-libs3, not ure as dependency
 +  * debian/control.ure.in:
 +    - remove obsolete cli-uno-bridge Suggests
  
 - -- Rene Engelhard <rene@debian.org>  Tue, 17 Jan 2012 01:36:05 +0000
 +  * merge from ubuntu-precise-3.5:
 +    - add debian multiarch support for Qt4
 +    - no dependencies needed for full builds
 +      + propagate gb_FULLDEPS
 +    - get rid of obsolete BrOffice specialcasing (LP: #884786)
 +    - enable l10n
 +  * merge from libreoffice_3.5.0_beta2-2ubuntu2
 +    - enable gio, disable gvfs 
  
 -libreoffice (1:3.4.5-1) unstable; urgency=medium
 + -- Rene Engelhard <rene@debian.org>  Tue, 17 Jan 2012 10:03:24 +0000
  
 -  * new upstream release
 -    - fixes build with bleeding edge external boost and gcc (closes: #652784)
 +libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
  
 -  * debian/libreoffice-{common,core}.postrm.in:
 -    - on remove, delete created services.rdb (closes: #650341) and
 -      remove all /var/lib content on remove (prereg/bundled, basisX.Y)
 +  * debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
 +  * debian/patches/make-package-modules-not-suck.diff: add missing , so
 +    that kde4be1.uno.so correctly ends up in -kde
 +
 +  * debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff,
 +    debian/rules: make patch apply again
 + 
 +  * debian/rules:
 +    - force boost to 1.46 due to ICE with 1.48  
 +    - prevent creating bogus gcc- build-dependency on gcj archs
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 30 Dec 2011 00:11:06 +0100
 +
 +libreoffice (1:3.5.0~beta2-1) experimental; urgency=low
 +
 +  [ Rene Engelhard ]
 +  * new upstream beta release
 +
 +  * debian/*:
 +    - use "core" sources, no libreoffice-build anymore. Loads of updates.
 +
 +  * debian/patches/*: move from patches/hotfixes to patch the code
 +    directly without libreoffice-build
 +
 +  * debian/rules, debian/vars.*, debian/*.links.in:
 +    - loads of updates for new envfile name and gone LIBSUFFIX
 +  * debian/rules:
 +    - enable new build against Gtk3
 +    - bump python b-d to >= 2.6 as we don't work with earlier anymore.
 +      Also build python3-uno
 +    - add new conditionals and build-deps for new (libvisio,librsvg,gettext,
 +      libcmis) libraries and libexttextcat switch - and those we needed to move
 +      from libreoffice-builds' distro-configs. Adapt for changed configure
 +      options
 +    - add new conditionals and build-deps for new libvisio,librsvg,gettext,
 +      libcmis usage and libexttextcat switch - and those we needed to move
 +      from libreoffice-builds' distro-configs
 +    - run new "make check" instead of solenv/bin/subsequenttests and
 +      manual smoketest
 +    - remove fakeroot hackaround
 +  * debian/rules, debian/make-package-modules-not-suck.diff: migrate loads of
 +    mv's in debian/rules to proper scp2 patches
 +  * debian/rules, debian/control.in: 
 +    - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
 +      /usr/share/dpkg/*.mk
    * debian/control.in:
 +     - update descriptions for new Gtk(3) print dialog
      - move libreoffice, libreoffice-l10n-{in,za} to new metapackages
        section
 -  * debian/vars.armhf: add
    * debian/control.fonts.in: ttf-opensymbol should be in oldlibs, thanks
      lintian
 -  * debian/rules:
 -    - prevent creating bogus gcc- build-dependency on gcj archs
 -    - fix qstart.desktop Exec= (closes: #655076)
 -    - update fakeroot hack for multiarch paths
 -    - stop creating a dependency on ure for uno-libs3 in .shlibs, use
 -      uno-libs3 instead
 -  * debian/uno-libs3.symbols:
 -    - use uno-libs3, not ure as dependency
 +  * debian/patches:
 +     - migrate reportdesign-mention-package.diff from libreoffice/build
 +     - migrate jdbc-driver-classpaths.diff from libreoffice/build
 +     - migrate mysqlcppconn-mysqlclient-SONAME.diff from libreoffice/build
 +     - migrate system-python-{ure-bootstrap,uno-path}.diff and
 +       pyuno-ooodir.diff from libreoffice/build
 +     - migrate split-icons-search-usr-share.diff from libreoffice/build
 +  * debian/vars.armhf: add
  
 -  * merge from ubuntu-precise-3.5:
 -    - add debian multiarch support for Qt4
 +  [ Bjoern Michaelsen ]
 +  * debian/rules:
 +    - set CURDIR before first use and use safe method to set it
 +    - update GIT_ vars, add GIT_BASEURL for local mirrors
 +    - update get-orig-source
 +    - build needs the ext-sources
 +  * debian/README:
 +    - update most outdated README sections
 +  * debian/patches:
 +    - migrate mention-java-common-package.diff from libreoffice/build
 +    - migrate help-msg-add-package-info.diff from libreoffice/build
 +    - update help-msg-add-package-info.diff, replace openoffice.org with
 +      libreoffice
 +    - migrate sensible-ooomua.diff from libreoffice/build and rename to
 +      sensible-lomua; add icedove and thunderbird as fallbacks
 +    - migrate sensible-browser.diff from libreoffice/build
  
 - -- Rene Engelhard <rene@debian.org>  Thu, 12 Jan 2012 18:56:37 +0000
 + -- Rene Engelhard <rene@debian.org>  Tue, 27 Dec 2011 10:16:18 +0000
  
  libreoffice (1:3.4.4-2) unstable; urgency=medium
  
diff --combined patches/mediwiki-oor-replace.diff
index 0000000,144723f..1301528
mode 000000,100644..100644
--- a/patches/mediwiki-oor-replace.diff
+++ b/patches/mediwiki-oor-replace.diff
@@@ -1,0 -1,89 +1,86 @@@
 ---- /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>@WIKIEXTENSIONID@</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/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
++--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu
+++++ b/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
++--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu
+++++ b/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
++--- a/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu
+++++ b/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
++--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu
+++++ b/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
++--- a/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu
+++++ b/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 --combined patches/series
index e4ca8c9,2278282..e998d91
--- a/patches/series
+++ b/patches/series
@@@ -1,30 -1,27 +1,31 @@@
 -splash-progressbarcolor.diff
 -buildfix-patches.diff
  no-minimaltoc.diff
 -update-debian-opt.diff
 -gcc4.6.0.diff
 +debian-opt.diff
  odk-jni-include.diff
 -disable-ooinstall-in-package-ooo.diff
  jurt-soffice-location.diff
 -packcomponents-remove-split-components.diff
 +split-binfilters-and-evo.diff
  debian-debug.diff
 -disable-rhino.diff
 -bsh-hardcode-path.diff
 -mips-openjdk-jre-paths.diff
 -autogen.diff
 +rhino-build-optional.diff
  disable-dynamic-list-cpp.diff
 -vbaobj-visibility-fix.diff
  make-gengal-work-again.diff
 -fix-distro-config.diff
 -mipsel-jfw-plugin-arch.diff
 -no-deprecated-options-in-qstart-wrappers.diff
 -update-sdbc-postgresql.diff
 -s390x.diff
 -update-libreoffice.1.diff
 -wordml2ooo_draw.xsl-add-missing-include.diff
 +fix-system-lpsolve-build.diff
 +install-fixes.diff
 +smoketest-only-en-US.diff
 +getMIMEDescription-mismatch.diff
 +mention-java-common-package.diff
 +help-msg-add-package-info.diff
 +sensible-lomua.diff
 +sensible-browser.diff
 +reportdesign-mention-package.diff
 +jdbc-driver-classpaths.diff
 +mysqlcppconn-mysqlclient-SONAME.diff
 +make-pyuno-work-with-system-wide-module-install.diff
 +search-usr-share-for-images.diff
 +make-package-modules-not-suck.diff
 +fix-ARM-detection-in-set-soenv.diff
  add-debian-multiarch-support.diff
 -jdbc-driver-threading.diff
 +revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
 +propagate-gb_FULLDEPS.diff
 +disable-sc-unoapi-subsequentcheck-for-now.diff
 +SwTblBoxFormula-destructor.diff
 +ia64-oox-size.diff
+ mediwiki-oor-replace.diff

-- 
LibreOffice packaging repository


Reply to: