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-01 23:06:51.000000000 -0500 +++ ampache-3.5.4/debian/ampache.postinst 2010-09-01 16:18:06.000000000 -0500 @@ -26,9 +26,8 @@ } apache_install() { - webserver=$1 - if [ -d /etc/$webserver/conf.d ] && [ ! -h /etc/$webserver/conf.d/ampache.conf ]; then - ln -s $AMP /etc/$webserver/conf.d/ampache.conf + if [ ! -f /etc/apache2/conf.d/ampache.conf ] && [ ! -h /etc/apache2/conf.d/ampache.conf ]; then + ln -s $AMP /etc/apache2/conf.d/ampache.conf if [ -f $ELCAMP ]; then rm -f $ELCAMP fi @@ -48,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-01 16:18:06.000000000 -0500 @@ -44,7 +44,7 @@ if [ "$webserver" = "lighttpd" ] ; then lighttpd_remove else - apache_remove $webserver + apache_remove 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/changelog ampache-3.5.4/debian/changelog --- ampache-3.5.4/debian/changelog 2010-08-02 12:59:25.000000000 -0500 +++ ampache-3.5.4/debian/changelog 2010-09-01 16:18:06.000000000 -0500 @@ -1,3 +1,38 @@ +ampache (3.5.4-7ubuntu1) maverick; urgency=low + + * Merged from debian, remaining changes: (LP: #620259) + * Removed $webserver variable from apache_install and ampache_remove + function calls in postinst and postrm. After hardcoding the symlink + creation having this variable causes the function to fail. + * Added updated it.po. Thx Luca Monducci + * Added updated ta.po. Thx Dr.T.Vasudevan + * Added updated zh_TW.po. Thx Kan-Ru Chen + + -- Charlie Smotherman Wed, 1 Sep 2010 16:01:54 -0500 + +ampache (3.5.4-7) unstable; urgency=high + + * Adjusted symlink creation in debian/postinst so it now works. + Closes: #593181 + * Upstream neglected to comment out the "require once" for + /modules/pearxmlrpc/rpc.php which causes the inital login after the + completion of the web installer to fail due to php not being able to find + /modules/pearxmlrpc/rpc.php. Closes: #593182 + + -- Charlie Smotherman Sun, 17 Aug 2010 06:51:29 -0500 + +ampache (3.5.4-6) unstable; urgency=high + + * Setting urgency to high as this fixes an RC bug. + * Upstream has decided to remove pearxmlrpc and make the package + depend on php5-xmlrpc. Closes: #591984 + * debian/control + - added php5-xmlrpc to Depends field. + * debian/rules + - added -X option to remove /modules/pearxmlrpc + + -- Charlie Smotherman Thu, 12 Aug 2010 09:59:36 -0500 + ampache (3.5.4-5) unstable; urgency=medium * Setting urgency to medium as this fixes an RC bug. diff -Nru ampache-3.5.4/debian/control ampache-3.5.4/debian/control --- ampache-3.5.4/debian/control 2010-08-02 04:46:26.000000000 -0500 +++ ampache-3.5.4/debian/control 2010-09-01 16:18:06.000000000 -0500 @@ -11,8 +11,8 @@ Package: ampache Architecture: all Depends: debconf (>= 0.5) | debconf-2.0, libapache2-mod-php5 | php5-cgi | php5, - php5-mysql, php5-cli, php5-auth-pam, libphp-snoopy, libjs-prototype, - ttf-freefont, libnusoap-php, ${misc:Depends} + php5-mysql, php5-cli, php5-auth-pam, php5-xmlrpc, libphp-snoopy, + libjs-prototype, ttf-freefont, libnusoap-php, ${misc:Depends} Conflicts: ampache-themes-3.3.3.5a-1 Recommends: apache2-mpm-prefork | lighttpd, eyed3, ampache-themes Suggests: php5-gd, phpmyadmin, mysql-server diff -Nru ampache-3.5.4/debian/patches/init_php_fix ampache-3.5.4/debian/patches/init_php_fix --- ampache-3.5.4/debian/patches/init_php_fix 1969-12-31 18:00:00.000000000 -0600 +++ ampache-3.5.4/debian/patches/init_php_fix 2010-09-01 16:18:06.000000000 -0500 @@ -0,0 +1,25 @@ +Description: /modules/pearxmlrpc removal + Upstream removed /modules/pearxmlrpc/* this was done is debian/rules, + however due to a "require once" statement in /lib/init.php, PHP is unable to + find /modules/pearxmlrpc/rpc.php thus the initial login after the completion + of the web installation process fails. This patch comments out that + statement. + . + This was communicated to upstream via IRC, thus a bug report was not placed + on upstreams bug tracker. +Author: Charlie Smotherman +Last-Update: 2010-08-18 + +Index: ampache-3.5.4/lib/init.php +=================================================================== +--- ampache-3.5.4.orig/lib/init.php 2010-08-18 05:53:13.000000000 -0500 ++++ ampache-3.5.4/lib/init.php 2010-08-18 05:53:41.000000000 -0500 +@@ -138,7 +138,7 @@ + require_once $prefix . '/lib/class/localplay.abstract.php'; + require_once $prefix . '/lib/class/database_object.abstract.php'; + require_once $prefix . '/lib/class/media.interface.php'; +-require_once $prefix . '/modules/pearxmlrpc/rpc.php'; ++//require_once $prefix . '/modules/pearxmlrpc/rpc.php'; + require_once $prefix . '/modules/getid3/getid3.php'; + require_once $prefix . '/modules/nusoap/nusoap.php'; + require_once $prefix . '/modules/infotools/Snoopy.class.php'; diff -Nru ampache-3.5.4/debian/patches/series ampache-3.5.4/debian/patches/series --- ampache-3.5.4/debian/patches/series 1969-12-31 18:00:00.000000000 -0600 +++ ampache-3.5.4/debian/patches/series 2010-09-01 16:18:06.000000000 -0500 @@ -0,0 +1 @@ +init_php_fix 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-01 16:18:06.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-01 16:18:06.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/rules ampache-3.5.4/debian/rules --- ampache-3.5.4/debian/rules 2010-08-01 23:25:11.000000000 -0500 +++ ampache-3.5.4/debian/rules 2010-09-01 16:18:06.000000000 -0500 @@ -6,4 +6,5 @@ override_dh_install: dh_install -XGPL-LICENSE -XINSTALL -XCOPYING -Xlicense -XLICENSE \ -Xreadme.windows.txt -Xprototype -XSnoopy -XFreeMono-Medium \ - -Xgather-messages.sh -Xnusoap -Xxspf_jukebox.fla -Xxspf_jukebox.swf + -Xgather-messages.sh -Xnusoap -Xxspf_jukebox.fla -Xxspf_jukebox.swf \ + -Xpearxmlrpc