The following commit has been merged in the debian-experimental-3.4.0 branch:
commit f3f687a9c80a2c2a2ec7fc65dafb1b14f54c6146
Author: Rene Engelhard <[email protected]>
Date: Sun Jul 3 16:35:37 2011 +0200
fix no-minimaltoc.diff to apply again
diff --git a/patches/no-minimaltoc.diff b/patches/no-minimaltoc.diff
index 73f3b32..a2c50da 100644
--- a/patches/no-minimaltoc.diff
+++ b/patches/no-minimaltoc.diff
@@ -6,8 +6,8 @@ Index: libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
PostgreSQL, RadioButtons, WWInProgress, \
KDE4Experimental, MinGW, Netbook, \
CrossWin32Patches, AutoLayout, \
-- Speed, GSoC2010, Toolbars, Win32Packaging
-+ Speed, GSoC2010, Toolbars, Win32Packaging, PowerPC
+- Speed, GSoC2010, Toolbars
++ Speed, GSoC2010, Toolbars, PowerPC
DebianLooseSections: DebianBaseNoHelpContent
# Optional sections
Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
@@ -21,9 +21,9 @@ Index:
libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
@@ -1481,3 +1481,7 @@
- # Patch to create a multilang installer and helppacks by default
- # This needs to be kept as a patch, do not integrate.
- instsetoo_native-win32-packaging.diff, fridrich
+ sd_effects_styles.diff, pixie
+ symbols-20-august.diff, i#11167, jopsen
+ vEdit-13-August.diff, jopsen
+
+[ PowerPC ]
+no-minimaltoc.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
