diff --git a/NEWS b/NEWS index 5fd699b5..ac28508a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,15 @@ +version 3.4.8 + +Romain Goffe: + Gérald De Palmas - Sur la route + Tonton David - Chacun sa route + Les Hurlements d'Léo - La malle en mai + Philippe Chatel & Robert Charlebois - La compagnie des lapins bleus + Oldelaf - Les mains froides + Soggy Bottom Boys - I am a man of constant sorrow + Pierre Perret - Bernard Pivot + version 3.4.7 Pipiou: diff --git a/books/volume-1.sb b/books/volume-1.sb index f867aa7b..8b02a7d7 100644 --- a/books/volume-1.sb +++ b/books/volume-1.sb @@ -48,7 +48,7 @@ "Georges_Brassens/La_mauvaise_reputation.sg", "Georges_Brassens/Le_gorille.sg", "Georges_Brassens/Les_copains_d_abord.sg", - "Georges_Brassens/La_chanson_du_herisson.sg", + "Philippe_Chatel/La_chanson_du_herisson.sg", "Graeme_Allwright/Il_faut_que_je_m_en_aille.sg", "Graeme_Allwright/Johnny.sg", "Graeme_Allwright/Jolie_Bouteille.sg", diff --git a/books/volume-4.sb b/books/volume-4.sb index 318f6d1f..5d5ee432 100644 --- a/books/volume-4.sb +++ b/books/volume-4.sb @@ -25,6 +25,7 @@ "Edith_Piaf/Padam_Padam.sg", "Francis_Cabrel/Je_t_aimais_je_t_aime_et_je_t_aimerai.sg", "Francis_Cabrel/L_encre_de_tes_yeux.sg", + "Gerald_De_Palmas/Sur_la_route.sg", "Herman_s_Hermits/No_milk_today.sg", "Jean-Jacques_Goldman/Long_is_the_road.sg", "Jeanne_Moreau/Le_tourbillon_de_la_vie.sg", @@ -44,6 +45,7 @@ "Les_Fatals_Picards/La_securite_de_l_emploi.sg", "Les_Fatals_Picards/Mon_pere_etait_tellement_de_gauche.sg", "Les_Fatals_Picards/Seul_et_celibataire.sg", + "Les_Hurlements_d_Leo/La_malle_en_mai.sg", "Les_Ogres_de_Barback/La_gare_de_Caen.sg", "Lucienne_Delyle/Mon_amant_de_Saint_Jean.sg", "Marie_Cherrier/Les_baleines.sg", @@ -58,17 +60,23 @@ "Nino_Ferrer/Mirza.sg", "Oldelaf_et_Monsieur_D/Courseulles_sur_Mer.sg", "Oldelaf_et_Monsieur_D/Le_monde_est_beau.sg", + "Oldelaf_et_Monsieur_D/Les_mains_froides.sg", "Oldelaf_et_Monsieur_D/Mamy_blue.sg", "Oldelaf_et_Monsieur_D/Mon_testament.sg", "Oldelaf_et_Monsieur_D/Nous_les_vedettes.sg", "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", "Renan_Luce/La_lettre.sg", "Renan_Luce/Monsieur_Marcel.sg", "Soan/Emilie.sg", + "Soggy_Bottom_Boys/I_am_a_man_of_constant_sorrow.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"] } diff --git a/songbook-client.png b/songbook-client.png new file mode 100644 index 00000000..48ad445c Binary files /dev/null and b/songbook-client.png differ diff --git a/utils/release.sh b/utils/release.sh index 418d1a44..d81b44b8 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -35,9 +35,9 @@ 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 else echo "keeping release version" fi; @@ -79,4 +79,6 @@ then git tag "patacrep_$MAIN.$MAJOR.$MINOR" fi +notify-send "Patacrep!" "Release $MAIN.$MAJOR.$MINOR generated" --icon=songbook-client + export GREP_OPTIONS="$GREP" diff --git a/utils/tarball.sh b/utils/tarball.sh index 1675a2ee..b66cf929 100755 --- a/utils/tarball.sh +++ b/utils/tarball.sh @@ -11,6 +11,7 @@ cp -RH songbook songbook-$(date +%d)-$(date +%m)-$(date +%Y); #Remove unecessary directories cd songbook-$(date +%d)-$(date +%m)-$(date +%Y); rm -rf perso/ ; +rm -rf build/ ; rm -rf data/ ; rm -rf .git/ ; rm -f .gitignore ; diff --git a/windows/cleanall.bat b/windows/cleanall.bat index 1fa4dec7..ee0255b1 100644 --- a/windows/cleanall.bat +++ b/windows/cleanall.bat @@ -1,3 +1,3 @@ Rem manually performs "make cleanall" -clean.bat +windows\\clean.bat del *.pdf diff --git a/windows/make.bat b/windows/make.bat index 5726874c..1f4325a7 100644 --- a/windows/make.bat +++ b/windows/make.bat @@ -1,12 +1,12 @@ Rem build tex file from songbook file -songbook.py --songbook=books\%1.sb --output=%1.tex +python songbook.py --songbook=books\%1.sb --output=%1.tex Rem 1st pdf compilation pdflatex %1.tex Rem build indexes -songbook-makeindex.py %1_title.sxd > %1_title.sbx -songbook-makeindex.py %1_auth.sxd > %1_auth.sbx +python songbook-makeindex.py %1_title.sxd > %1_title.sbx +python songbook-makeindex.py %1_auth.sxd > %1_auth.sbx Rem 2nd compilation to include indexes pdflatex %1.tex