Generated by (address unknown), From = lilypond-1.5.54, To = lilypond-1.5.54.mb1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.54.mb1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure diff -purN ../lilypond-1.5.54/ChangeLog ./ChangeLog --- ../lilypond-1.5.54/ChangeLog Tue Apr 23 20:35:41 2002 +++ ./ChangeLog Wed Apr 24 20:00:32 2002 @@ -1,3 +1,7 @@ +2002-04-24 Mats Bengtsson + + * scripts/lilypond-book.py: Don't import pre for Python >= 2.2 + 2002-04-23 Han-Wen Nienhuys * VERSION: 1.5.54 released diff -purN ../lilypond-1.5.54/VERSION ./VERSION --- ../lilypond-1.5.54/VERSION Tue Apr 23 20:33:20 2002 +++ ./VERSION Wed Apr 24 20:00:39 2002 @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=54 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=mb1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff -purN ../lilypond-1.5.54/scripts/lilypond-book.py ./scripts/lilypond-book.py --- ../lilypond-1.5.54/scripts/lilypond-book.py Tue Apr 23 12:23:27 2002 +++ ./scripts/lilypond-book.py Wed Apr 24 20:03:14 2002 @@ -50,15 +50,15 @@ import operator # Handle bug in Python 1.6-2.1 # # there are recursion limits for some patterns in Python 1.6 til 2.1. -# fix this by importing pre instead. Fix by Mats. +# fix this by importing the 1.5.2 implementation pre instead. Fix by Mats. -# todo: should check Python version first. -try: - import pre - re = pre - del pre -except ImportError: - import re +if float (sys.version[0:3]) < 2.2: + try: + import pre + re = pre + del pre + except ImportError: + import re program_version = '@TOPLEVEL_VERSION@' if program_version == '@' + 'TOPLEVEL_VERSION' + '@':