Package: phppgadmin Version: 4.0.1-3.1 Severity: normal Tags: patch Hi,
Attached is the diff for my phppgadmin 4.0.1-3.2 NMU during the current BSP which I'll upload to delayed-0. -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u phppgadmin-4.0.1/debian/changelog phppgadmin-4.0.1/debian/changelog --- phppgadmin-4.0.1/debian/changelog +++ phppgadmin-4.0.1/debian/changelog @@ -1,3 +1,11 @@ +phppgadmin (4.0.1-3.2) unstable; urgency=high + + * Non-maintainer upload during BSP. + * Fix unconditional use of debconf in postrm (Closes: #417007). + * Update Portuguese debconf translation (Closes: #413772). + + -- Luk Claes <[EMAIL PROTECTED]> Sat, 19 May 2007 18:45:10 +0200 + phppgadmin (4.0.1-3.1) unstable; urgency=low * Non-maintainer upload to fix pending l10n issues. diff -u phppgadmin-4.0.1/debian/postrm phppgadmin-4.0.1/debian/postrm --- phppgadmin-4.0.1/debian/postrm +++ phppgadmin-4.0.1/debian/postrm @@ -2,32 +2,34 @@ set -e -. /usr/share/debconf/confmodule -db_version 2.0 || [ $? -lt 30 ] - -db_get "phppgadmin/webserver" || true -webserver="$RET" -case "$webserver" in - Apache) webservers="apache";; - Apache-SSL) webservers="apache-ssl";; - Apache-Perl) webservers="apache-perl";; - Apache2) webservers="apache2";; - *) webservers="";; -esac - -includefile=/etc/phppgadmin/apache.conf - -if [ "$1" = "remove" ]; then - for server in $webservers; do - test -d /etc/$server || continue - conffile=/etc/$server/conf.d/phppgadmin - if [ -L "$conffile" ]; then - if [ `readlink -m -n $conffile` = "$includefile" ]; then - rm $conffile - fi - fi - restart="$restart $server" - done +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_version 2.0 || [ $? -lt 30 ] + + db_get "phppgadmin/webserver" || true + webserver="$RET" + case "$webserver" in + Apache) webservers="apache";; + Apache-SSL) webservers="apache-ssl";; + Apache-Perl) webservers="apache-perl";; + Apache2) webservers="apache2";; + *) webservers="";; + esac + + includefile=/etc/phppgadmin/apache.conf + + if [ "$1" = "remove" ]; then + for server in $webservers; do + test -d /etc/$server || continue + conffile=/etc/$server/conf.d/phppgadmin + if [ -L "$conffile" ]; then + if [ `readlink -m -n $conffile` = "$includefile" ]; then + rm $conffile + fi + fi + restart="$restart $server" + done + fi fi servers="apache-ssl apache-perl apache apache2" @@ -37,7 +39,7 @@ # End of package maintainer's commands if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then - db_purge + db_purge || true fi if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then @@ -54,5 +56,5 @@ #DEBHELPER# -db_stop +db_stop || true exit 0 diff -u phppgadmin-4.0.1/debian/po/pt.po phppgadmin-4.0.1/debian/po/pt.po --- phppgadmin-4.0.1/debian/po/pt.po +++ phppgadmin-4.0.1/debian/po/pt.po @@ -1,7 +1,8 @@ # Portuguese translation for phppgadmin debconf messages. -# This file is distributed under the same license as the php-memcache package. +# This file is distributed under the same license as the phppgadmin package. # 2005, Carlos Castro <[EMAIL PROTECTED]> # 2005-11-01 Carlos Castro <[EMAIL PROTECTED]> Initial translation +# 2007 Lu??sa Louren??o <[EMAIL PROTECTED]> # msgid "" msgstr "" @@ -48,9 +49,8 @@ #. Type: select #. Description #: ../phppgadmin.templates:1002 -#, fuzzy msgid "Web server to reconfigure automatically:" -msgstr "Que servidor web gostaria de reconfigurar automaticamente?" +msgstr "Servidor de web a reconfigurar automaticamente:" #. Type: select #. Description @@ -61,3 +61,3 @@ msgstr "" -"phpPgAdmin suporta qualquer servidor web que o PHP4 suporte, mas este " +"O phpPgAdmin suporta qualquer servidor web que o PHP4 suporte, mas este " "processo de configura????o autom??tica apenas suporta servidores Apache."
