*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index badcb475139b7b76f2faca460e24c5384a320dbb..4eb16e083c908370fdf480409c72273ac04c2f0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,11 @@
 
 2006-05-17  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * python/lilylib.py (system): move import subprocess to system()
+       definition. Backportme.
+
+       * python/convertrules.py (conv): fix convert-ly rules for 2.9.4
+
        * VERSION (PATCH_LEVEL): release 2.9.5
        
        * Documentation/topdocs/INSTALL.texi (Top): update versions and

diff --git a/python/convertrules.py b/python/convertrules.py
index 40e6bfba4e904c97f0bdfcd830f9c64c801d169d..3bc19ef5f8d8eaa1be93e404c77e04dd89497e90 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2784,8 +2784,8 @@ conversions.append (((2, 7, 40), conv,
 
 
 def conv (str):
-    str = re.sub ('page-penalty', 'page-break-penalty')
-    str = re.sub ('([^-])penalty', '\1break-penalty')
+    str = re.sub ('page-penalty', 'page-break-penalty', str)
+    str = re.sub ('([^-])penalty', '\1break-penalty', str)
     return str
 
 conversions.append (((2, 9, 4), conv, """(page-)penalty -> (page-)break-penalty"""))

diff --git a/python/lilylib.py b/python/lilylib.py
index 10bddbb6f71167253fbcd6d43d25d0800ac28086..7b43bcb2419c31d391a45043a90ac9bcdd6f5e7e 100644 (file)
--- a/python/lilylib.py
+++ b/python/lilylib.py
@@ -3,7 +3,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 #
-# (c) 1998--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+# (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 
 import __main__
@@ -14,14 +14,6 @@ import shutil
 import string
 import sys
 import optparse
-import subprocess
-
-## windows mingw cross compile doesn't have selectmodule.so
-have_fcntl = True
-try:
-    import fcntl
-except ImportError:
-    have_fcntl = False
 
 ################################################################
 # Users of python modules should include this snippet
@@ -68,10 +60,12 @@ def command_name (cmd):
     return os.path.basename (cmd)
 
 def system (cmd,
-             ignore_error=False,
-             progress_p=True,
-             be_verbose=False,
-             log_file=None):
+            ignore_error=False,
+            progress_p=True,
+            be_verbose=False,
+            log_file=None):
+    
+    import subprocess
 
     show_progress= progress_p 
     name = command_name (cmd)
@@ -141,7 +135,6 @@ def print_environment ():
     for (k,v) in os.environ.items ():
        sys.stderr.write ("%s=\"%s\"\n" % (k, v)) 
 
-
 class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter):
     def format_heading(self, heading):
        if heading:

diff --git a/python/midi.c b/python/midi.c
index 23d67eb3b7ad71878526218a026af955b5c14e60..b5e2f5bf57b1b6a14ca920b124732091abd46b24 100644 (file)
--- a/python/midi.c
+++ b/python/midi.c
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2001--2006 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2001--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
             Jan Nieuwenhuizen <janneke@gnu.org>
 
 */