From be119598b0ecf7ebdc611430b882da0c7748ff18 Mon Sep 17 00:00:00 2001 From: janneke Date: Tue, 30 Aug 2005 19:03:08 +0000 Subject: [PATCH] Include MY_PATCH_LEVEL in config.make's VERSION. --- ChangeLog | 5 +++++ VERSION | 2 +- ly/Welcome_to_LilyPond.ly | 2 +- stepmake/aclocal.m4 | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d90151fda..53b16f6bc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-30 Jan Nieuwenhuizen + + * stepmake/aclocal.m4: Include MY_PATCH_LEVEL in config.make's + VERSION. + 2005-08-26 Han-Wen Nienhuys * scripts/lilypond-book.py (get_latex_textwidth): remove unixisms diff --git a/VERSION b/VERSION index c39372e5e7..da074b0284 100644 --- a/VERSION +++ b/VERSION @@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=6 PATCH_LEVEL=3 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=1 diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly index 0948d32523..220f869f29 100644 --- a/ly/Welcome_to_LilyPond.ly +++ b/ly/Welcome_to_LilyPond.ly @@ -31,4 +31,4 @@ That's it. For more information, visit http://lilypond.org . } -\version "2.5.25" % necessary for upgrading to future LilyPond versions. +\version "2.6.0" % necessary for upgrading to future LilyPond versions. diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index d8830e8a24..397b9d8be8 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -581,11 +581,11 @@ AC_DEFUN(STEPMAKE_INIT, [ . $srcdir/VERSION FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL MICRO_VERSION=$PATCH_LEVEL - VERSION=$FULL_VERSION TOPLEVEL_VERSION=$FULL_VERSION if test x$MY_PATCH_LEVEL != x; then FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL fi + VERSION=$FULL_VERSION export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] changequote(<<, >>)#dnl -- 2.39.5