[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-8-gb236620
The following commit has been merged in the master branch:
commit 68806669882e0a1c4a4d62488457ab6edc891acf
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Mon Nov 21 14:33:24 2011 +0100
backport patch from master to add missing include (closes: #648250)
diff --git a/changelog b/changelog
index c7ade54..b6b005b 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:3.4.4-2) UNRELEASED; urgency=low
* debian/patches/libebook-1.2.so.11.diff: remove ...
* debian/patches/libebook-1.2.so.12.diff: ... for this and update
accordingly (evolution 3.2)
+ * debian/patches/wordml2ooo_draw.xsl-add-missing-include.diff: backport
+ patch from master to add missing include (closes: #648250)
* debian/rules:
- recommend fonts-thai-tlwg instead of ttf-thai-tlwg (closes: #648785)
diff --git a/patches/series b/patches/series
index 52f60b7..abf411f 100644
--- a/patches/series
+++ b/patches/series
@@ -23,3 +23,4 @@ update-sdbc-postgresql.diff
jdk-1.7.0-vendorname.diff
s390x.diff
update-libreoffice.1.diff
+wordml2ooo_draw.xsl-add-missing-include.diff
diff --git a/patches/wordml2ooo_draw.xsl-add-missing-include.diff b/patches/wordml2ooo_draw.xsl-add-missing-include.diff
new file mode 100644
index 0000000..abbfc8b
--- /dev/null
+++ b/patches/wordml2ooo_draw.xsl-add-missing-include.diff
@@ -0,0 +1,23 @@
+--- /dev/null 2011-11-18 23:57:45.520533843 +0100
++++ libreoffice-3.4.4/libreoffice-build/patches/hotfixes/wordml2ooo_draw.xsl-add-missing-include.diff 2011-11-21 14:30:12.000000000 +0100
+@@ -0,0 +1,20 @@
++From 6af8887b41a8438d29b4743f238be7330516ecbc Mon Sep 17 00:00:00 2001
++From: Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>
++Date: Mon, 21 Nov 2011 12:49:06 +0000
++Subject: d#648250: added missing include in wordml2ooo_draw.xsl
++
++---
++diff --git a/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl b/filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
++index 448923f..e36d7cd 100644
++--- filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
+++++ filter/source/xslt/import/wordml/wordml2ooo_draw.xsl
++@@ -27,6 +27,7 @@
++ -->
++ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml"; xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint"; xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:aml="http://schemas.microsoft.com/aml/2001/core"; xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:d
atastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:ole="http://libreoffice.org/2011/xslt/ole"; exclude-result-prefixes="w wx aml o dt v">
++ <xsl:include href="wordml2ooo_custom_draw.xsl"/>
+++ <xsl:include href="wordml2ooo_path.xsl"/>
++
++ <xsl:key name="imagedata" match="w:binData" use="@w:name"/>
++ <xsl:key name="shapetype" match="v:shapetype" use="concat('#', @id)"/>
++--
++cgit v0.9.0.2-2-gbebe
--
LibreOffice packaging repository
Reply to: