Bug#416747: NMU upload

[Steffen Joeris]

tags 416747 patch
thanks

Hi mate

Enclosed you find the NMU I uploaded during the BSP to fix this issue.

Cheers
Steffen

diff -u gallery-1.5.5-pl1/debian/changelog gallery-1.5.5-pl1/debian/changelog
--- gallery-1.5.5-pl1/debian/changelog
+++ gallery-1.5.5-pl1/debian/changelog
@@ -1,3 +1,11 @@
+gallery (1.5.5-pl1-1.1) unstable; urgency=high
+
+  * Non-maintainer upload during BSP
+  * Fix unconditional use of debconf in postrm (Closes: #416747)
+  * Include Spanish debconf translation (Closes: #423703)
+
+ -- Steffen Joeris <[EMAIL PROTECTED]>  Fri, 18 May 2007 21:48:30 +1000
+
 gallery (1.5.5-pl1-1) unstable; urgency=high
 
   * New upstream release (Closes: #398862)
diff -u gallery-1.5.5-pl1/debian/postrm gallery-1.5.5-pl1/debian/postrm
--- gallery-1.5.5-pl1/debian/postrm
+++ gallery-1.5.5-pl1/debian/postrm
@@ -3,11 +3,10 @@
 set -e
 
 if [ -f /usr/share/debconf/confmodule ]; then
-   . /usr/share/debconf/confmodule
+   	. /usr/share/debconf/confmodule
+   	db_version 2.0 || [ $? -lt 30 ]
 fi
 
-db_version 2.0 || [ $? -lt 30 ]
-
 if [ "$1" = "purge" ]; then
 
     db_get gallery/reconfigure || true
@@ -26,11 +25,11 @@
             apache|apache-perl|apache-ssl|apache2)
                 rm -f /etc/$webserver/conf.d/gallery
                 test -x /usr/sbin/$webserver || continue
-                db_reset gallery/restart
-                db_subst gallery/restart webserver "$webserver"
+                db_reset gallery/restart || true
+                db_subst gallery/restart webserver "$webserver" || true
                 db_input gallery/restart high || true
-                db_go
-                db_get gallery/restart-webserver
+                db_go || true
+                db_get gallery/restart-webserver || true
                 if [ "$RET" = "true" ]; then
                     restart="$restart $webserver"
                 fi
only in patch2:
unchanged:
--- gallery-1.5.5-pl1.orig/debian/po/es.po
+++ gallery-1.5.5-pl1/debian/po/es.po
@@ -0,0 +1,67 @@
+# gallery po-debconf translation to Spanish
+# Copyright (C) 2005 Software in the Public Interest
+# This file is distributed under the same license as the gallery package.
+#
+# Changes:
+#  - Initial translation
+#         César Gómez Martín <[EMAIL PROTECTED]>
+#
+#  - Revision
+#         Rudy Godoy Guillén <[EMAIL PROTECTED]>, 2007
+#
+#   Traductores, si no conoce el formato PO, merece la pena leer la
+#   documentación de gettext, especialmente las secciones dedicadas a este
+#   formato, por ejemplo ejecutando:
+#          info -n '(gettext)PO Files'
+#          info -n '(gettext)Header Entry'
+# Equipo de traducción al español, por favor, lean antes de traducir
+# los siguientes documentos:
+#
+#  - El proyecto de traducción de Debian al español
+#    http://www.debian.org/intl/spanish/
+#    especialmente las notas de traducción en
+#    http://www.debian.org/intl/spanish/notas
+#
+#  - La guía de traducción de po's de debconf:
+#    /usr/share/doc/po-debconf/README-trans
+#    o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gallery 1.5.1-1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-30 03:40+0000\n"
+"PO-Revision-Date: 2007-05-13 18:42-0500\n"
+"Last-Translator: César Gómez Martín <[EMAIL PROTECTED]>\n"
+"Language-Team: Debian l10n spanish <[EMAIL PROTECTED]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. Type: multiselect
+#. Description
+#: ../gallery.templates:5
+msgid "Which web server would you like to reconfigure automatically?"
+msgstr "¿Qué servidor web le gustaría reconfigurar automáticamente?"
+
+#. Type: multiselect
+#. Description
+#: ../gallery.templates:5
+msgid "If you do not select a web server to reconfigure automatically, gallery will not be usable until you reconfigure your webserver to enable gallery."
+msgstr "Si no selecciona un servidor web para que se reconfigure automáticamente, gallery no podrá usarse hasta que reconfigure su servidor web para habilitar gallery."
+
+#. Type: boolean
+#. Description
+#: ../gallery.templates:13
+msgid "Should ${webserver} be restarted?"
+msgstr "¿Desea reiniciar ${webserver}?"
+
+#. Type: boolean
+#. Description
+#: ../gallery.templates:13
+msgid "Remember that in order to activate the new configuration ${webserver} has to be restarted. You can also restart ${webserver} by manually executing invoke-rc.d ${webserver} restart."
+msgstr "Recuerde que para activar la nueva configuración se debe reiniciar ${webserver}. También puede reiniciar ${webserver} ejecutando manualmente «invoke-rc.d ${webserver} restart»."
+

pgpVY98x5uvAC.pgp
Description: PGP signature