Merge branch 'master' into lilypond/translation

[lilypond.git] / scripts / convert-ly.py

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 3c447b915751be42c4b40977365b1d5419237093..c0c7ee3e354fdee020bfeeb971cf92f91be57ec0 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -5,7 +5,7 @@
 
 # This file is part of LilyPond, the GNU music typesetter.
 #
-# Copyright (C) 1998--2010  Han-Wen Nienhuys <hanwen@xs4all.nl>
+# Copyright (C) 1998--2011  Han-Wen Nienhuys <hanwen@xs4all.nl>
 #                 Jan Nieuwenhuizen <janneke@gnu.org>
 #
 # LilyPond is free software: you can redistribute it and/or modify
@@ -78,7 +78,7 @@ def warranty ():
 
 %s
 %s
-''' % ( _ ('Copyright (c) %s by') % '2001--2010',
+''' % ( _ ('Copyright (c) %s by') % '2001--2011',
         ' '.join (authors),
         _ ('Distributed under terms of the GNU General Public License.'),
         _ ('It comes with NO WARRANTY.')))
@@ -259,9 +259,11 @@ def do_one_file (infile_name):
         if global_options.diff_version_update:
             if result == input:
                 # check the y in x.y.z  (minor version number)
-                if last[0:2] != from_version[0:2]:
+                previous_stable = (last[0], 2*(last[1]/2), 0)
+                if ((last[0:2] != from_version[0:2]) and
+                    (previous_stable > from_version)):
                     # previous stable version
-                    last = (last[0], 2*(last[1]/2), 0)
+                    last = previous_stable
                 else:
                     # make no (actual) change to the version number
                     last = from_version