The following commit has been merged in the master branch:
commit d2dc67d9f0054d7e49d8d9dafb7d9d21b94a62b7
Author: Rene Engelhard <r...@debian.org>
Date: Wed Mar 2 00:43:02 2011 +0100
make cherry-picked ppc64 patches from Ubuntu also be effective on Debian
diff --git a/patches/no-minimaltoc.diff b/patches/no-minimaltoc.diff
index e48a956..5ae01b6 100644
--- a/patches/no-minimaltoc.diff
+++ b/patches/no-minimaltoc.diff
@@ -4,7 +4,7 @@ Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply 2011-03-01
14:40:52.064672001 +0100
@@ -2391,4 +2391,4 @@
- [ UbuntuOnly ]
+ [ PowerPC ]
ppc64-openjdk.diff
-
+no-minimaltoc.diff
diff --git a/patches/ppc-openjdk.diff b/patches/ppc-openjdk.diff
index e868d2b..8591bd7 100644
--- a/patches/ppc-openjdk.diff
+++ b/patches/ppc-openjdk.diff
@@ -18,11 +18,29 @@
+ print "Setting Linux PPC specific values... ";
--- libreoffice/libreoffice-build/patches/dev300/apply 2011-03-01
14:10:55.164672003 +0100
+++ libreoffice/libreoffice-build/patches/dev300/apply 2011-03-01
14:11:47.424672376 +0100
+@@ -34,7 +34,7 @@
+ KDE4Experimental, MinGW, CalcExperimental, \
+ OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
+ WriterNavigation \
+- HPPA, AXP, ARM, Speed, GSoC2010, Toolbars
++ HPPA, AXP, ARM, PowerPC, Speed, GSoC2010, Toolbars
+ DebianLooseSections: DebianBaseNoHelpContent
+ # Optional sections
+ Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
+@@ -66,7 +66,7 @@
+ # Slackware
+ Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
+ # Debian
+-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PostgreSQL, ARM
++DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split,
PostgreSQL, ARM, PowerPC
+ Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP,
kFreeBSD
+ DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
+ # Ubuntu
@@ -2388,3 +2388,7 @@
[ AXP ]
alpha-no-relax.diff
+
-+[ UbuntuOnly ]
++[ PowerPC ]
+ppc64-openjdk.diff
+
--
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/e1puren-0008kg...@alioth.debian.org
