diff --git a/NEWS b/NEWS index 442e5212..57cf4315 100644 --- a/NEWS +++ b/NEWS @@ -1,20 +1,16 @@ -version 3.5.1 +version 3.5.2 Alexandre Dupas: Matteo Cypriani: - Jean Leloup - Promeneur - Maxime Le Forestier - Parachutiste - Yves Simon - Les bateaux du métro - Soldat Louis - Du rhum des femmes - Soldat Louis - Tirer des caisses - Soldat Louis - Savannah - Thiéfaine - Sentiments numériques revisités - Leonard Cohen - Winter Lady - Leonard Cohen - A Bunch of Lonesome Heroes - Leonard Cohen - The Old Revolution - Jacques Higelin - Je ne peux plus dire je t'aime +Pipiou: Romain Goffe: +broph: + Noir Désir - Lazy + William Baldé - Rayon de soleil + +version 3.5.1 + broph: M - La Seine Noir Désir - Charlie @@ -42,7 +38,6 @@ broph: version 3.5.0 -Alexandre Dupas: Matteo Cypriani: Jean Leloup - Promeneur Maxime Le Forestier - Parachutiste diff --git a/books/volume-4.sb b/books/volume-4.sb index 332bda8f..561838bc 100644 --- a/books/volume-4.sb +++ b/books/volume-4.sb @@ -80,6 +80,7 @@ "Noir_Desir/Joey_I.sg", "Noir_Desir/La_chaleur.sg", "Noir_Desir/La_rage.sg", + "Noir_Desir/Lazy.sg", "Noir_Desir/Le_fleuve.sg", "Noir_Desir/Si_rien_ne_bouge.sg", "Noir_Desir/Tu_m_donnes_le_mal.sg", @@ -112,6 +113,7 @@ "Telephone/New_York_avec_toi.sg", "Tonton_David/Chacun_sa_route.sg", "Tracy_Chapman/Talkin_about_the_revolution.sg", + "William_Balde/Rayon_de_soleil.sg", "Yves_Duteil/Le_petit_pont_de_bois.sg", "Yves_Simon/Les_bateaux_du_metro.sg"] } diff --git a/templates/ancient.tmpl b/templates/ancient.tmpl index 7ace8089..c56e3ee6 100644 --- a/templates/ancient.tmpl +++ b/templates/ancient.tmpl @@ -30,7 +30,7 @@ %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","pictures","tabs"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.1"}, +%%: {"name":"version", "description":"Version", "default":"3.5.2"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/patacrep-en.tmpl b/templates/patacrep-en.tmpl index d137ab62..c6619045 100644 --- a/templates/patacrep-en.tmpl +++ b/templates/patacrep-en.tmpl @@ -30,7 +30,7 @@ %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"lang", "description":"Language", "default":"english"}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","lilypond","pictures","tabs"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.1"}, +%%: {"name":"version", "description":"Version", "default":"3.5.2"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/templates/patacrep.tmpl b/templates/patacrep.tmpl index a30f5aa9..f0c2e466 100644 --- a/templates/patacrep.tmpl +++ b/templates/patacrep.tmpl @@ -30,7 +30,7 @@ %%: {"name":"booktype", "description":"Type", "type":"enum", "values":["chorded","lyric"], "default":"chorded", "mandatory":true}, %%: {"name":"lang", "description":"Language", "default":"french"}, %%: {"name":"bookoptions", "description":"Options", "type":"flag", "values":["diagram","importantdiagramonly","lilypond","pictures","tabs","repeatchords"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.5.1"}, +%%: {"name":"version", "description":"Version", "default":"3.5.2"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"}, diff --git a/utils/release.sh b/utils/release.sh index 1991a94f..25c99ae9 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -38,7 +38,6 @@ then sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/patacrep.tmpl sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/ancient.tmpl sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/patacrep-en.tmpl - sed -i "s/\"[0-9]\+.[0-9]\+.[0-9]\+\"/\"$MAIN.$MAJOR.$MINOR\"/" templates/patacrep-improved.tmpl else echo "keeping release version" fi; @@ -51,6 +50,11 @@ fi; ./utils/rules.py ./utils/resize-cover.py +#check for rights +chmod 755 songs/* +chmod 644 songs/*.* +chmod 644 lilypond/*.ly + #build all songbooks rm -f *.d make cleanall