[SCM] LibreOffice packaging repository branch, master, updated. d2dc67d9f0054d7e49d8d9dafb7d9d21b94a62b7
The following commit has been merged in the master branch:
commit aaffab8b8755794f803d0aedaff29505e1afb9d4
Author: Matthias Klose <doko@canonical.com>
Date: Tue Mar 1 14:43:18 2011 +0100
lp#727118: no minimal-toc on ppc64
diff --git a/changelog b/changelog
index c847784..46badb0 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ libreoffice (1:3.3.1-2) UNRELEASED; urgency=low
* make -wiki-publisher depend on -java-common
+ * merge from Ubuntu:
+ - added ppc fixes (LP: #727118)
+
-- Rene Engelhard <rene@debian.org> Tue, 01 Mar 2011 22:13:42 +0100
libreoffice (1:3.3.1-1) unstable; urgency=low
diff --git a/patches/no-minimaltoc.diff b/patches/no-minimaltoc.diff
new file mode 100644
index 0000000..e48a956
--- /dev/null
+++ b/patches/no-minimaltoc.diff
@@ -0,0 +1,24 @@
+Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
+===================================================================
+--- libreoffice-3.3.1.orig/libreoffice-build/patches/dev300/apply 2011-03-01 14:37:29.144671999 +0100
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply 2011-03-01 14:40:52.064672001 +0100
+@@ -2391,4 +2391,4 @@
+
+ [ UbuntuOnly ]
+ ppc64-openjdk.diff
+-
++no-minimaltoc.diff
+Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/no-minimaltoc.diff
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libreoffice-3.3.1/libreoffice-build/patches/dev300/no-minimaltoc.diff 2011-03-01 14:37:20.344672014 +0100
+@@ -0,0 +1,9 @@
++--- solenv/inc/unxlngppc64.mk
+++++ solenv/inc/unxlngppc64.mk
++@@ -30,5 +30,4 @@
++ .INCLUDE : unxlngppc.mk
++
++ CDEFS+=-DPOWERPC64
++-CFLAGSCXX+=-mminimal-toc
++ BUILD64=1
++
diff --git a/patches/series b/patches/series
index d42946d..bd42196 100644
--- a/patches/series
+++ b/patches/series
@@ -10,3 +10,4 @@ javaldx-LibreOffice.diff
alpha-no-relax.diff
disable-impress-media-embedding.diff
ppc-openjdk.diff
+no-minimaltoc.diff
--
LibreOffice packaging repository
Reply to: