[ooo-build-commit] patches/dev300

[René Engelhard]

 patches/dev300/apply |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f51dcd7fec95deaab8d2f10e8afc7c4424be651f
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Sep 11 17:52:02 2009 +0200

    Revert "Cleanup"
    
    This reverts commit 00e8849dc35350d3397d4ff900c28613168ce119.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5708852..4943162 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -495,15 +495,17 @@ localize-pl-cygwin-paths.diff, tml
 
 # fix path to the python binary in the mailmerge.py script
 # /bin/python does not exists and breaks the automatic rpm dependencies
-# FIXME: 2008-11-26: the mailmerge.py in dev300-m35 doesn't have any #! line at all!? --tml
+# FIXME 2008-11-26: the mailmerge.py in dev300-m35 doesn't have any #! line at all!?
 #scripting-mailmerge-python-binary.diff, pmladek
 
+[ Fixes < dev300-m58 ]
 # Allow some technically illegal pathname components on Win32
 # (directories with trailing spaces or periods) because some SMB
 # servers like Netware (and Samba, if mangled names = No) do serve
 # such directories if they exist on the server's host system.
 win32-invalid-names.diff, n#277603, tml
 
+[ Fixes ]
 # make CustomUnitText "Pixel" localisable
 customunittext-pixel.diff, i#61043, atimar