From 02752971d4d1cddff86d26af1fd6b14263d7dba4 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 Jun 2002 17:45:04 +0000 Subject: [PATCH] (prev_ver): Bugfix: assume new diff naming scheme. --- ChangeLog | 3 +++ VERSION | 2 +- stepmake/bin/release.py | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1987a81cd..0fc179168c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2002-06-18 Jan Nieuwenhuizen + * 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 35b1dcf171..00bcbe540d 100644 --- 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 864c157558..61a416f813 100755 --- 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) -- 2.39.5