diff -Nru ampache-3.5.4/debian/ampache.config ampache-3.5.4/debian/ampache.config --- ampache-3.5.4/debian/ampache.config 2010-08-01 23:06:51.000000000 -0500 +++ ampache-3.5.4/debian/ampache.config 2010-09-15 15:53:07.000000000 -0500 @@ -9,10 +9,8 @@ . /usr/share/debconf/confmodule db_version 2.0 || [ 0 -lt 30 ] -db_set ampache/webserver_type || true db_input critical ampache/webserver_type || true db_go || true -db_set ampache/restart_webserver || true db_input critical ampache/restart_webserver || true db_go || true diff -Nru ampache-3.5.4/debian/ampache.postinst ampache-3.5.4/debian/ampache.postinst --- ampache-3.5.4/debian/ampache.postinst 2010-08-15 22:17:57.000000000 -0500 +++ ampache-3.5.4/debian/ampache.postinst 2010-09-15 15:53:07.000000000 -0500 @@ -34,7 +34,7 @@ fi } -if [ "$1" = "configure" ] || [ "$1" = "upgrade" ]; then +if [ "$1" = "configure" ]; then db_get ampache/webserver_type || true webservers="$RET" @@ -47,7 +47,7 @@ if [ "$webserver" = "lighttpd" ] ; then lighttpd_install else - apache_install $webserver + apache_install fi if [ -x /usr/sbin/invoke-rc.d ]; then invoke-rc.d $webserver restart 3>/dev/null || true diff -Nru ampache-3.5.4/debian/ampache.postrm ampache-3.5.4/debian/ampache.postrm --- ampache-3.5.4/debian/ampache.postrm 2010-08-01 23:06:51.000000000 -0500 +++ ampache-3.5.4/debian/ampache.postrm 2010-09-21 18:20:27.000000000 -0500 @@ -22,8 +22,8 @@ $LDM ampache fi if [ -h $ELCE/50-ampache.conf ] ; then - echo 'Manually deleting lighttpd/ampache configuration link' - rm $ELCE/50-ampache.conf + echo 'Manually deleting lighttpd/ampache configuration link' + rm $ELCE/50-ampache.conf fi fi } @@ -35,39 +35,42 @@ } if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then - #Ask the question and restart web server. - db_get ampache/restart_webserver || true + #Ask the question and restart web server. + db_get ampache/restart_webserver || true - webserver="$RET" - for webserver in $webservers; do - webserver=${webserver%,} - if [ "$webserver" = "lighttpd" ] ; then - lighttpd_remove - else - apache_remove $webserver - fi - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver restart 3>/dev/null || true - else - /etc/init.d/$webserver restart 3>/dev/null || true - fi - done + if [ "$RET" = "true" ]; then + db_get ampache/webserver_type || true + webservers="$RET" + for webserver in $webservers; do + webserver=${webserver%,} + if [ "$webserver" = "lighttpd" ] ; then + lighttpd_remove + else + apache_remove + fi + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver restart 3>/dev/null || true + else + /etc/init.d/$webserver restart 3>/dev/null || true + fi + done + fi fi if [ "$1" = "purge" ]; then - #This is needed to remove user added content. - if [ -d $EAMP ]; then - rm -rf $EAMP - fi - if [ -d $UAMP ]; then - rm -rf $UAMP - fi + #This is needed to remove user added content. + if [ -d $EAMP ]; then + rm -rf $EAMP + fi + if [ -d $UAMP ]; then + rm -rf $UAMP + fi fi if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then - if [ -f /etc/cron.daily/ampache ]; then - rm -f /etc/cron.daily/ampache - fi + if [ -f /etc/cron.daily/ampache ]; then + rm -f /etc/cron.daily/ampache + fi fi #DEBHELPER# diff -Nru ampache-3.5.4/debian/changelog ampache-3.5.4/debian/changelog --- ampache-3.5.4/debian/changelog 2010-08-17 06:52:04.000000000 -0500 +++ ampache-3.5.4/debian/changelog 2010-09-21 21:35:53.000000000 -0500 @@ -1,3 +1,17 @@ +ampache (3.5.4-8) unstable; urgency=low + + * Made requested changes from the Release Team (Adam) to ampache.config + postinst, and postrm to fix symlink creation. Closes: #593759 + * Made the requested spacing changes from the Release Team (Adam) in the + postrm. + * Added updated it.po. Thx Luca Monducci Closes: #593959 + * Added updated ta.po. Thx Dr.T.Vasudevan + * Added updated cs.po. Thx Miroslav Kure Closes: #595512 + * Added zh_TW.po. Thx Kan-Ru Chen + * Added da.po. Thx Joe Dalton Closes: #595197 + + -- Charlie Smotherman Tue, 21 Sep 2010 21:34:54 -0500 + ampache (3.5.4-7) unstable; urgency=high * Adjusted symlink creation in debian/postinst so it now works. diff -Nru ampache-3.5.4/debian/po/.goutputstream-2UBCIV ampache-3.5.4/debian/po/.goutputstream-2UBCIV --- ampache-3.5.4/debian/po/.goutputstream-2UBCIV 1969-12-31 18:00:00.000000000 -0600 +++ ampache-3.5.4/debian/po/.goutputstream-2UBCIV 2010-09-15 15:53:07.000000000 -0500 @@ -0,0 +1,68 @@ +# Italian translation of Ampache debconf templates. +# Copyright (C) 2007 Ampache.org. +# This file is distributed under the same license as the Ampache package. +# Luca Monducci , 2007-2010. +# +msgid "" +msgstr "" +"Project-Id-Version: ampache 3.5.4 italian debconf\n" +"Report-Msgid-Bugs-To: ampache@packages.debian.org\n" +"POT-Creation-Date: 2010-05-30 15:04-0500\n" +"PO-Revision-Date: 2010-08-22 17:51+0200\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Choices +#: ../ampache.templates:2001 +msgid "apache2" +msgstr "apache2" + +#. Type: multiselect +#. Choices +#: ../ampache.templates:2001 +msgid "lighttpd" +msgstr "lighttpd" + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "Web server to configure automatically:" +msgstr "Server web da configurare automaticamente:" + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "" +"Please select the web server to be configured automatically for Ampache." +msgstr "" +"Scegliere il server web da configurare automaticamente per Ampache." + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "" +"Apache2 and Lighttpd are the only supported web servers for automatic " +"configuration." +msgstr "" +"Apache2 e Lighttpd sono i soli server web supportati per la configurazione " +"automatica." + +#. Type: boolean +#. Description +#: ../ampache.templates:3001 +msgid "Configure and restart the web server?" +msgstr "Configurare e riavviare il server web?" + +#. Type: boolean +#. Description +#: ../ampache.templates:3001 +msgid "" +"The web server needs to be reconfigured and restarted to enable Ampache. " +"Please choose whether you want to restart it automatically now or do it " +"yourself later." +msgstr "" +" \ No newline at end of file diff -Nru ampache-3.5.4/debian/po/.goutputstream-HN35HV ampache-3.5.4/debian/po/.goutputstream-HN35HV --- ampache-3.5.4/debian/po/.goutputstream-HN35HV 1969-12-31 18:00:00.000000000 -0600 +++ ampache-3.5.4/debian/po/.goutputstream-HN35HV 2010-09-15 15:53:07.000000000 -0500 @@ -0,0 +1,68 @@ +# Italian translation of Ampache debconf templates. +# Copyright (C) 2007 Ampache.org. +# This file is distributed under the same license as the Ampache package. +# Luca Monducci , 2007-2010. +# +msgid "" +msgstr "" +"Project-Id-Version: ampache 3.5.4 italian debconf\n" +"Report-Msgid-Bugs-To: ampache@packages.debian.org\n" +"POT-Creation-Date: 2010-05-30 15:04-0500\n" +"PO-Revision-Date: 2010-08-22 17:51+0200\n" +"Last-Translator: Luca Monducci \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Choices +#: ../ampache.templates:2001 +msgid "apache2" +msgstr "apache2" + +#. Type: multiselect +#. Choices +#: ../ampache.templates:2001 +msgid "lighttpd" +msgstr "lighttpd" + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "Web server to configure automatically:" +msgstr "Server web da configurare automaticamente:" + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "" +"Please select the web server to be configured automatically for Ampache." +msgstr "" +"Scegliere il server web da configurare automaticamente per Ampache." + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "" +"Apache2 and Lighttpd are the only supported web servers for automatic " +"configuration." +msgstr "" +"Apache2 e Lighttpd sono i soli server web supportati per la configurazione " +"automatica." + +#. Type: boolean +#. Description +#: ../ampache.templates:3001 +msgid "Configure and restart the web server?" +msgstr "Configurare e riavviare il server web?" + +#. Type: boolean +#. Description +#: ../ampache.templates:3001 +msgid "" +"The web server needs to be reconfigured and restarted to enable Ampache. " +"Please choose whether you want to restart it automatically now or do it " +"yourself later." +msgstr "" +" \ No newline at end of file diff -Nru ampache-3.5.4/debian/po/it.po ampache-3.5.4/debian/po/it.po --- ampache-3.5.4/debian/po/it.po 2010-08-01 23:06:51.000000000 -0500 +++ ampache-3.5.4/debian/po/it.po 2010-09-15 15:53:07.000000000 -0500 @@ -1,37 +1,37 @@ # Italian translation of Ampache debconf templates. # Copyright (C) 2007 Ampache.org. # This file is distributed under the same license as the Ampache package. -# 2007 Luca Monducci . +# Luca Monducci , 2007-2010. # msgid "" msgstr "" -"Project-Id-Version: ampache italian debconf\n" +"Project-Id-Version: ampache 3.5.4 italian debconf\n" "Report-Msgid-Bugs-To: ampache@packages.debian.org\n" "POT-Creation-Date: 2010-05-30 15:04-0500\n" -"PO-Revision-Date: 2007-10-10 21:09+0200\n" +"PO-Revision-Date: 2010-08-22 17:51+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: multiselect #. Choices #: ../ampache.templates:2001 msgid "apache2" -msgstr "" +msgstr "apache2" #. Type: multiselect #. Choices #: ../ampache.templates:2001 msgid "lighttpd" -msgstr "" +msgstr "lighttpd" #. Type: multiselect #. Description #: ../ampache.templates:2002 msgid "Web server to configure automatically:" -msgstr "" +msgstr "Server web da configurare automaticamente:" #. Type: multiselect #. Description @@ -39,6 +39,7 @@ msgid "" "Please select the web server to be configured automatically for Ampache." msgstr "" +"Scegliere il server web da configurare automaticamente per Ampache." #. Type: multiselect #. Description @@ -47,29 +48,24 @@ "Apache2 and Lighttpd are the only supported web servers for automatic " "configuration." msgstr "" +"Apache2 e Lighttpd sono i soli server web supportati per la configurazione " +"automatica." #. Type: boolean #. Description #: ../ampache.templates:3001 -#, fuzzy -#| msgid "Restart Apache 2 web server?" msgid "Configure and restart the web server?" -msgstr "Riavviare il server web Apache 2?" +msgstr "Configurare e riavviare il server web?" #. Type: boolean #. Description #: ../ampache.templates:3001 -#, fuzzy -#| msgid "" -#| "The Apache 2 web server needs to be restarted to enable Ampache. Please " -#| "choose whether you want to restart it automatically now or do it yourself " -#| "later." msgid "" "The web server needs to be reconfigured and restarted to enable Ampache. " "Please choose whether you want to restart it automatically now or do it " "yourself later." msgstr "" -"Il server web Apache 2 deve essere riavviato per attivare Ampache; " +"È necessario riconfigurare e riavviare il server web per attivare Ampache; è " "possibile riavviarlo automaticamente adesso oppure manualmente, da soli, in " "seguito." @@ -80,6 +76,9 @@ "To manually restart the web server, use one of the following commands: \"/" "etc/init.d/apache2 restart\" or \"/etc/init.d/lighttpd restart\"" msgstr "" +"Per riavviare manualmente il server web, usare uno di questi comandi: " +"\"etc/init.d/apache2 restart\" oppure \"/etc/init.d/lighttpd restart\"" #~ msgid "Configure Apache 2 web server for use with Ampache?" #~ msgstr "Configurare il server web Apache 2 per l'uso con Ampache?" + diff -Nru ampache-3.5.4/debian/po/ta.po ampache-3.5.4/debian/po/ta.po --- ampache-3.5.4/debian/po/ta.po 2010-08-01 23:06:51.000000000 -0500 +++ ampache-3.5.4/debian/po/ta.po 2010-09-15 15:53:07.000000000 -0500 @@ -8,7 +8,7 @@ "Project-Id-Version: ampache\n" "Report-Msgid-Bugs-To: ampache@packages.debian.org\n" "POT-Creation-Date: 2010-05-30 15:04-0500\n" -"PO-Revision-Date: 2007-10-07 13:19+0530\n" +"PO-Revision-Date: 2010-08-29 07:22+0530\n" "Last-Translator: Dr.T.Vasudevan \n" "Language-Team: TAMIL \n" "MIME-Version: 1.0\n" @@ -20,26 +20,26 @@ #. Choices #: ../ampache.templates:2001 msgid "apache2" -msgstr "" +msgstr "அபாசே2" #. Type: multiselect #. Choices #: ../ampache.templates:2001 msgid "lighttpd" -msgstr "" +msgstr "லைட்டிபிடி" #. Type: multiselect #. Description #: ../ampache.templates:2002 msgid "Web server to configure automatically:" -msgstr "" +msgstr "தானியங்கி வடிவமைப்புக்கு வலை சேவையகம்" #. Type: multiselect #. Description #: ../ampache.templates:2002 msgid "" "Please select the web server to be configured automatically for Ampache." -msgstr "" +msgstr "அம்பாச்சேக்கு தானியங்கியாக வடிவமைக்க வலை சேவையகத்தை தேர்ந்தெடுக்கவும்." #. Type: multiselect #. Description @@ -48,31 +48,25 @@ "Apache2 and Lighttpd are the only supported web servers for automatic " "configuration." msgstr "" +"தானியங்கி வடிவமைப்புக்கு ஆதரவு தரும் வ்லை சேவையகங்கள் அபாசே2 மற்றும் லைட்டிபிடி மட்டுமே." #. Type: boolean #. Description #: ../ampache.templates:3001 -#, fuzzy -#| msgid "Restart Apache 2 web server?" msgid "Configure and restart the web server?" -msgstr "அபாசே 2 வலை சேவையகத்தை மீள்துவக்கவா?" +msgstr "வடிவமைத்து வலை சேவையகத்தை மீள்துவக்கவா?" #. Type: boolean #. Description #: ../ampache.templates:3001 -#, fuzzy -#| msgid "" -#| "The Apache 2 web server needs to be restarted to enable Ampache. Please " -#| "choose whether you want to restart it automatically now or do it yourself " -#| "later." msgid "" "The web server needs to be reconfigured and restarted to enable Ampache. " "Please choose whether you want to restart it automatically now or do it " "yourself later." msgstr "" -"அம்பாசே ஐ செயல்படுத்த அபாசே 2 வலை சேவையகத்தை மீள்துவக்க வேண்டியுள்ளது. தயை செய்து " -"இப்போது அதை தானியங்கியாக துவக்க வேண்டுமா அல்லது நீங்களே பின்னால் அதை துவக்குவீர்களா என " -"தேர்ந்தெடுங்கள்." +"அம்பாசே ஐ செயல்படுத்த வலை சேவையகத்தை மறு வடிவமைத்து மீள்துவக்க வேண்டியுள்ளது. தயை " +"செய்து இப்போது அதை தானியங்கியாக துவக்க வேண்டுமா அல்லது நீங்களே பின்னால் அதை " +"துவக்குவீர்களா என தேர்ந்தெடுங்கள்." #. Type: boolean #. Description @@ -81,6 +75,8 @@ "To manually restart the web server, use one of the following commands: \"/" "etc/init.d/apache2 restart\" or \"/etc/init.d/lighttpd restart\"" msgstr "" +"கைமுறையாக வலை சேவையகத்தி மீள்துவக்க பின் வரும் கட்டளைகளில் ஒன்றை பயன்படுத்தவும்: etc/" +"init.d/apache2 restart\" அல்லது \"/etc/init.d/lighttpd restart\"" #~ msgid "Configure Apache 2 web server for use with Ampache?" #~ msgstr "அபாசே 2 வலை சேவையகத்தை அம்பாசே உடன் வடிவமைக்கவா?" diff -Nru ampache-3.5.4/debian/po/zh_TW.po ampache-3.5.4/debian/po/zh_TW.po --- ampache-3.5.4/debian/po/zh_TW.po 1969-12-31 18:00:00.000000000 -0600 +++ ampache-3.5.4/debian/po/zh_TW.po 2010-09-15 15:53:07.000000000 -0500 @@ -0,0 +1,72 @@ +# zh_TW po-debconf translation for ampache +# Copyright (C) 2010 Charlie Smotherman +# This file is distributed under the same license as the ampache package. +# Kan-Ru Chen , 2010 +# +msgid "" +msgstr "" +"Project-Id-Version: ampache 3.5.4-7\n" +"Report-Msgid-Bugs-To: ampache@packages.debian.org\n" +"POT-Creation-Date: 2010-05-30 15:04-0500\n" +"PO-Revision-Date: 2010-08-29 11:40+0800\n" +"Last-Translator: Kan-Ru Chen \n" +"Language-Team: Debian Chinese Traditional \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Choices +#: ../ampache.templates:2001 +msgid "apache2" +msgstr "apache2" + +#. Type: multiselect +#. Choices +#: ../ampache.templates:2001 +msgid "lighttpd" +msgstr "lighttpd" + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "Web server to configure automatically:" +msgstr "選擇要設定的伺服器" + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "" +"Please select the web server to be configured automatically for Ampache." +msgstr "請選擇要自動為 Ampache 設定的網頁伺服器。" + +#. Type: multiselect +#. Description +#: ../ampache.templates:2002 +msgid "" +"Apache2 and Lighttpd are the only supported web servers for automatic " +"configuration." +msgstr "Apache2 和 Lighttpd 是目前支援自動設定的網頁伺服器。" + +#. Type: boolean +#. Description +#: ../ampache.templates:3001 +msgid "Configure and restart the web server?" +msgstr "設定並重新啟動網頁伺服器？" + +#. Type: boolean +#. Description +#: ../ampache.templates:3001 +msgid "" +"The web server needs to be reconfigured and restarted to enable Ampache. " +"Please choose whether you want to restart it automatically now or do it " +"yourself later." +msgstr "網頁伺服器設定後必須重新啟動以啟用 Ampache。請選擇您使否想要現在自動重新啟動，或稍候手動執行。" + +#. Type: boolean +#. Description +#: ../ampache.templates:3001 +msgid "" +"To manually restart the web server, use one of the following commands: \"/" +"etc/init.d/apache2 restart\" or \"/etc/init.d/lighttpd restart\"" +msgstr "要手動重啟網頁伺服器，可以使用以下命令：\"/etc/init.d/apache2 restart\" 或 \"/etc/init.d/lighttpd restart\""