From ee5d8c468e680adb4a52dfb9101659ce3a6fb6db Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Wed, 22 Feb 2012 21:03:52 +0100 Subject: [PATCH 1/2] utils: update release script --- utils/release.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/utils/release.sh b/utils/release.sh index d81b44b8..1991a94f 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -35,9 +35,10 @@ then fi; echo "new version : $MAIN.$MAJOR.$MINOR" #update version field in tmpl files - 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.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; @@ -70,11 +71,12 @@ make clean git status -if [ $# -eq 1 ]; +if [ $# -eq 1 ] then ./utils/new-songs-list.sh | cat - NEWS > /tmp/out && mv -f /tmp/out NEWS echo "\nversion $MAIN.$MAJOR.$MINOR\n" | cat - NEWS > /tmp/out && mv -f /tmp/out NEWS - git add templates/patacrep-en.tmpl templates/patacrep.tmpl templates/ancient.tmpl books/volume-4.sb NEWS + git add templates/*.tmpl + git add books/volume-4.sb NEWS git commit -m "patacrep release version $MAIN.$MAJOR.$MINOR" git tag "patacrep_$MAIN.$MAJOR.$MINOR" fi From b8e7dc53ace29eec568cbf7b21c21d7e8cfdd8e6 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Wed, 22 Feb 2012 21:35:00 +0100 Subject: [PATCH 2/2] patacrep release version 3.5.0 --- NEWS | 19 +++++++++++++++++++ books/volume-4.sb | 16 ++++++++++++++-- templates/ancient.tmpl | 2 +- templates/patacrep-en.tmpl | 2 +- templates/patacrep-improved.tmpl | 2 +- templates/patacrep.tmpl | 2 +- 6 files changed, 37 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index ac28508a..ceadb057 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,23 @@ +version 3.5.0 + +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 +Romain Goffe: + Ben E.King - Stand by me + Coldplay - Paradise + version 3.4.8 Romain Goffe: diff --git a/books/volume-4.sb b/books/volume-4.sb index 5d5ee432..a946a619 100644 --- a/books/volume-4.sb +++ b/books/volume-4.sb @@ -12,6 +12,7 @@ "subtitle" : "Tome 4", "songs" : [ "Alain_Souchon/Bidon.sg", + "Ben_E_King/Stand_by_me.sg", "Bob_Marley/No_woman_no_cry.sg", "Bob_Marley/Redemption_song.sg", "Boby_Lapointe/Aragon_et_Castille.sg", @@ -19,6 +20,7 @@ "Charles_Aznavour/Mes_emmerdes.sg", "Christophe/Aline.sg", "Christophe/Les_mots_bleus.sg", + "Coldplay/Paradise.sg", "Damien_Rice/Cannonball.sg", "Daniel_Guichard/Mon_vieux.sg", "Daniel_Lanois/Jolie_Louise.sg", @@ -27,7 +29,10 @@ "Francis_Cabrel/L_encre_de_tes_yeux.sg", "Gerald_De_Palmas/Sur_la_route.sg", "Herman_s_Hermits/No_milk_today.sg", + "Hubert-Felix_Thiefaine/Sentiments_numeriques_revisites.sg", + "Jacques_Higelin/Je_ne_peux_plus_dire_je_t_aime.sg", "Jean-Jacques_Goldman/Long_is_the_road.sg", + "Jean_Leloup/Promeneur.sg", "Jeanne_Moreau/Le_tourbillon_de_la_vie.sg", "Joe_Dassin/Ma_bonne_etoile.sg", "Julien_Clerc/Ce_n_est_rien.sg", @@ -40,7 +45,10 @@ "Laura_Veirs/Black_eyed_Susan.sg", "Laura_Veirs/Icebound_stream.sg", "Laura_Veirs/Jailhouse_fire.sg", + "Leonard_Cohen/A_bunch_of_lonesome_heroes.sg", "Leonard_Cohen/Suzanne.sg", + "Leonard_Cohen/The_old_revolution.sg", + "Leonard_Cohen/Winter_lady.sg", "Les_Fatals_Picards/L_amour_a_la_francaise.sg", "Les_Fatals_Picards/La_securite_de_l_emploi.sg", "Les_Fatals_Picards/Mon_pere_etait_tellement_de_gauche.sg", @@ -55,6 +63,7 @@ "Maxime_Le_Forestier/Fontenay_aux_roses.sg", "Maxime_Le_Forestier/Je_ne_sais_rien_faire.sg", "Maxime_Le_Forestier/L_auto_stop.sg", + "Maxime_Le_Forestier/Parachutiste.sg", "Michel_Fugain/Forteresse.sg", "Negresses_vertes/Sous_le_soleil_de_Bodega.sg", "Nino_Ferrer/Mirza.sg", @@ -67,7 +76,6 @@ "Oldelaf_et_Monsieur_D/Super_heros.sg", "Oldelaf_et_Monsieur_D/Vendredi.sg", "Pep_s/Liberta.sg", - "Philippe_Chatel/La_chanson_du_herisson.sg", "Philippe_Chatel/La_compagnie_des_lapins_bleus.sg", "Pierre_Perret/Bernard_Pivot.sg", "Pigalle/Dans_la_salle_du_bar_tabac_de_la_rue_des_martyrs.sg", @@ -75,8 +83,12 @@ "Renan_Luce/Monsieur_Marcel.sg", "Soan/Emilie.sg", "Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.sg", + "Soldat_Louis/Du_rhum_des_femmes.sg", + "Soldat_Louis/Savannah.sg", + "Soldat_Louis/Tirer_des_caisses.sg", "Telephone/Cendrillon.sg", "Tonton_David/Chacun_sa_route.sg", "Tracy_Chapman/Talkin_about_the_revolution.sg", - "Yves_Duteil/Le_petit_pont_de_bois.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 e579e2a7..7e2f377b 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.3.10"}, +%%: {"name":"version", "description":"Version", "default":"3.5.0"}, %%: {"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 62447510..9e007fc7 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.4.7"}, +%%: {"name":"version", "description":"Version", "default":"3.5.0"}, %%: {"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-improved.tmpl b/templates/patacrep-improved.tmpl index f3e48ae3..f0cff9f9 100644 --- a/templates/patacrep-improved.tmpl +++ b/templates/patacrep-improved.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.4.7"}, +%%: {"name":"version", "description":"Version", "default":"3.5.0"}, %%: {"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 67c27040..7a8e991d 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","lilypond","pictures","tabs"], "join":",", "mandatory":true, "default":["diagram","pictures"]}, -%%: {"name":"version", "description":"Version", "default":"3.4.7"}, +%%: {"name":"version", "description":"Version", "default":"3.5.0"}, %%: {"name":"subtitle", "description":"Subtitle"}, %%: {"name":"web", "description":"Web", "default":"http://www.patacrep.com"}, %%: {"name":"mail", "description":"Email", "default":"crep@team-on-fire.com"},