(prev_ver): Bugfix: assume new diff

naming scheme.

diff --git a/ChangeLog b/ChangeLog
index a1987a81cd57440ea6f60c1a2b35d6d965b0fe04..0fc179168cb0d1af482d5f8c675fedc85674f422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-06-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * stepmake/bin/release.py (prev_ver): Bugfix: assume new diff
+       naming scheme.
+
        * Documentation/windows/zlily-profile.sh:
        * Documentation/windows/post-lilypond.sh: Assume normal
        prefix=/usr for lilypond.

diff --git a/VERSION b/VERSION
index 35b1dcf17192b7a1c89081f656bde7360ecc92bd..00bcbe540d28ce628f701ea5bb744e2b86be1868 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=61
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py
index 864c157558cb082767b53e3657aacac0e632b5ba..61a416f813f399d002c91029177e6928a9ac7e4d 100755 (executable)
--- a/stepmake/bin/release.py
+++ b/stepmake/bin/release.py
@@ -63,7 +63,10 @@ os.link(orig,  os.path.join (package.release_dir, tarball))
 # urg: howto check exit code?
 os.system(sys.executable + ' ' + package.topdir + '/stepmake/bin/package-diff.py --outdir=%s --package=%s' % (outdir, topdir))
 
-diffname = pn + '.diff.gz'
+prev_ver = prev_version (cur_ver)
+dn = '%s-%s-%s' % (package.name, version_tuple_to_str (prev_ver),
+                  version_tuple_to_str (cur_ver))
+diffname = dn + '.diff.gz'
 rel_pn = package.patch_dir + diffname
 
 diffname = os.path.join (outdir, diffname)