The following commit has been merged in the debian-experimental-3.5 branch:
commit bb9488c57feab58e0c2e70053208eb4e495a6aa7
Author: Rene Engelhard <r...@debian.org>
Date: Mon May 14 19:29:23 2012 +0200
wiki-publisher-add-missing-xsls.diff is also upstream now
diff --git a/changelog b/changelog
index dc7d119..9ee8d42 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.4~rc1~git20120511-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.4~rc1~git20120513-1) UNRELEASED; urgency=low
* new upstream release candidate snapshot
diff --git a/patches/series b/patches/series
index e119fd1..0e5eee9 100644
--- a/patches/series
+++ b/patches/series
@@ -35,4 +35,3 @@ lp-926940-visio-mime-for-draw.diff
gcc-4.4.diff
lp-904212-add-missing-mimetypes-to-impress.desktop.diff
ignore-sc_cellrangesbase-fails.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
deleted file mode 100644
index a083f95..0000000
--- a/patches/wiki-publisher-add-missing-xsls.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 29b7738085c4fb272b845900ef908f621d02cd68 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sberg...@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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1stza2-00059n...@vasks.debian.org
