Merge 2.11.66 conversion rule into 2.12.0

diff --git a/python/convertrules.py b/python/convertrules.py
index 6c379dae9ec203cac3745fc80f0e240991bbaf60..8aa8d295534bd9294628dbdb4a2cfdab2eb40ebf 100644 (file)
--- a/python/convertrules.py
+++ b/python/convertrules.py
@@ -2844,7 +2844,9 @@ def conv (str):
         str = re.sub ('InnerChoirStaff', 'ChoirStaff', str)
     return str
 
-@rule ((2, 11, 66), "Syntax changes for \\addChordShape and \\chord-shape")
+@rule ((2, 12, 0),
+       _ ("Syntax changes for \\addChordShape and \\chord-shape") + "\n" + \
+       _ ("bump version for release"))
 def conv(str):
     if re.search(r'\\addChordShape', str):
         stderr_write ("\n")
@@ -2860,10 +2862,6 @@ chord-shape call.\n"))
         raise FatalConversionError ()
     return str
 
-@rule ((2, 12, 0), _ ("bump version for release"))
-def conv (str):
-    return str
-
 # Guidelines to write rules (please keep this at the end of this file)
 #
 # - keep at most one rule per version; if several conversions should be done,