[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-4-gc29adc4
The following commit has been merged in the master branch:
commit 2ea7a8015137bf4e0798c2c402d33b02ad0c86c2
Author: Rene Engelhard <rene@debian.org>
Date: Fri May 11 00:40:20 2012 +0200
fix wiki-publisher
diff --git a/changelog b/changelog
index 2dd4b1f..bcfb231 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,8 @@ libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
* debian/patches/ignore-sc_cellrangesbase-fails.diff:
make .IGNORE actually work
+ * debian/patches/wiki-publisher-add-missing-xsls.diff:
+ add missing .xsls for -wiki-publisher
-- Rene Engelhard <rene@debian.org> Tue, 08 May 2012 11:37:43 +0200
diff --git a/patches/series b/patches/series
index 7cc0ffa..8e7c80c 100644
--- a/patches/series
+++ b/patches/series
@@ -38,3 +38,4 @@ ignore-sc_cellrangesbase-fails.diff
mozilla-profile-absolute-paths.diff
more-robust-nss-initialization.diff
fix-bean.diff
+wiki-publisher-add-missing-xsls.diff
diff --git a/patches/wiki-publisher-add-missing-xsls.diff b/patches/wiki-publisher-add-missing-xsls.diff
new file mode 100644
index 0000000..a083f95
--- /dev/null
+++ b/patches/wiki-publisher-add-missing-xsls.diff
@@ -0,0 +1,30 @@
+From 29b7738085c4fb272b845900ef908f621d02cd68 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman@redhat.com>
+Date: Wed, 09 May 2012 09:16:33 +0000
+Subject: fdo#46509: xsltml .xsl files missing from wiki-publisher.oxt
+
+A regression introduced by e7a1e17c4fdea4103e7f921e8cd9c315c1dbe612 "convert
+swext to gbuild and add to tail_build."
+
+Change-Id: I29efe28ad6353d725afe9cce6f470c5492aa87a8
+---
+diff --git a/swext/Extension_wiki-publisher.mk b/swext/Extension_wiki-publisher.mk
+index 1b6eb51..f142446 100644
+--- a/swext/Extension_wiki-publisher.mk
++++ b/swext/Extension_wiki-publisher.mk
+@@ -53,6 +53,13 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(WIKI
+ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
+ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
+ $(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
++$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(OUTDIR)/bin/xslt/export/xsltml/cmarkup.xsl))
++$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(OUTDIR)/bin/xslt/export/xsltml/entities.xsl))
++$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(OUTDIR)/bin/xslt/export/xsltml/glayout.xsl))
++$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(OUTDIR)/bin/xslt/export/xsltml/mmltex.xsl))
++$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(OUTDIR)/bin/xslt/export/xsltml/scripts.xsl))
++$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tables.xsl))
++$(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tokens.xsl))
+ $(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
+ $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
+ $(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
+--
+cgit v0.9.0.2-2-gbebe
--
LibreOffice packaging repository
Reply to: