dif name

diff --git a/VERSION b/VERSION
index 9b3ebc3c30dabc9050ff4af2c4b6ce5c7e258989..5f243dd0675a1c079b87215615437620718caf39 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
-PATCH_LEVEL=55
-MY_PATCH_LEVEL=hjj2
+PATCH_LEVEL=56
+MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index 17c80f15f983961a51c28755475f5ea2b16ac23d..60b024c15a51419a678a1eb0e1b1361b09273133 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,3 +1,5 @@
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 

diff --git a/lily/kpath.cc b/lily/kpath.cc
index c1d2bffaa0aae38e2bb888e1f2c9e630a8b6d9d7..473b955120bb389433cadf6686c6dab163b7ae28 100644 (file)
--- a/lily/kpath.cc
+++ b/lily/kpath.cc
@@ -26,7 +26,6 @@ extern "C" {
 #include "string.hh"
 #include "main.hh"
 #include "kpath.hh"
-#include "lily-version.hh"
 #include "warn.hh"
 
 String

diff --git a/scm/lily.scm b/scm/lily.scm
index 66dae47b15f20f2b4de77617662cbdefec6bad00..2108e99262df0c11ded40373301a09cce565e80b 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -114,11 +114,12 @@
 
 
 (define (ly-load x)
+  ;; should check verbose
+;;  (format (current-error-port) "[~s]" x)
   (primitive-load (%search-load-path x))
 
   )
 
-(ly-load "output-lib.scm")
 
 
 

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 81d56d38819a983a9039c6c72fb553971e601617..8eca9bea4585d24d279fff2065f09fcf856cfd41 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -261,10 +261,7 @@ this is not an override
   
 (define (check-start-chords music)
   "Check music expression for a Simultaneous_music containing notes
-(ie. Request_chords), without context specification.
-
-Called  from parser.
-"
+(ie. Request_chords), without context specification. Called  from parser."
      (let*
        ((es (ly-get-mus-property music 'elements))
        (e (ly-get-mus-property music 'element))

diff --git a/stepmake/bin/package-diff.py b/stepmake/bin/package-diff.py
index 357ab5046a9924737935d83436f3221a55a02a6a..361a6c74fc2d071e47b64361fe1d1d09a64e816f 100644 (file)
--- a/stepmake/bin/package-diff.py
+++ b/stepmake/bin/package-diff.py
@@ -306,8 +306,11 @@ if conf and not outdir:
        outdir = 'out-' + conf
 
 if not patch_name:
-       to_diff + '.diff'
-patch_name = compat_abspath (os.path.join (outdir, to_diff + '.diff'))
+       patch_name = os.path.join (outdir, '%s-%s-%s.diff' % (package.name,
+                                                             version_tuple_to_str (flags.from_version),
+                                                             version_tuple_to_str (flags.to_version)))
+
+       patch_name = compat_abspath (patch_name)
 
 from_diff = '/tmp/package-diff/' + from_diff
 to_diff =  '/tmp/package-diff/' + to_diff