patch::: 1.5.42.jcn1

2002-03-18  Jan Nieuwenhuizen  <janneke@gnu.org>

	* stepmake/bin/add-html-footer.py: Website title fix.

diff --git a/ChangeLog b/ChangeLog
index cdc811d3ab505358c8fea356fb20b1629696f5e2..b3add57fb57027ce0531b5c201f43ff6fe9f5d3b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-18  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/bin/add-html-footer.py: Website title fix.
+
 2002-03-15  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
  
        * buildscripts/lilypond-profile.sh: 

diff --git a/VERSION b/VERSION
index 655452a893500cdde4f3d82c42de32ee187fbc9c..31aa0176e2a208fb26748d415e05e30fecc314ca 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=42
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 54e313b9f239cfd575f266a09be8993d8a45c93e..f7cdac7ffbda1dfd586f88177bc9d6d99bb4a4de 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -250,8 +250,8 @@ def do_file (f):
        s = re.sub ('@BRANCH@', branch_str, s)  
 
        # ugh, python2.[12] re is broken.
-       #pat = re.compile ('.*?<!--\s*(@[^@]*@)\s*=\s*([^\s]*)\s*-->', re.DOTALL)
-       pat = re.compile ('[.\n]*?<!--\s*(@[^@]*@)\s*=\s*([^\s]*)\s*-->')
+       #pat = re.compile ('.*?<!--\s*(@[^@]*@)\s*=\s*([^>]*)\s*-->', re.DOTALL)
+       pat = re.compile ('[.\n]*?<!--\s*(@[^@]*@)\s*=\s*([^>]*)\s*-->')
        m = pat.search (s)
        while m:
                at_var = m.group (1)