Package: backuppc Version: 3.0.0-2 Severity: normal Tags: patch Hi,
Attached is the diff for my backuppc 3.0.0-2.1 NMU which I uploaded 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 backuppc-3.0.0/debian/po/de.po backuppc-3.0.0/debian/po/de.po --- backuppc-3.0.0/debian/po/de.po +++ backuppc-3.0.0/debian/po/de.po @@ -1,3 +1,4 @@ +# translation of backuppc_3.0.0-2_de.po to German # # Translators, if you are not familiar with the PO format, gettext # documentation is worth reading, especially sections dedicated to @@ -11,90 +12,76 @@ -# Erik Schanze <[EMAIL PROTECTED]>, 2004. # +# Erik Schanze <[EMAIL PROTECTED]>, 2004-2007. msgid "" msgstr "" -"Project-Id-Version: backuppc_2.1.0-5_de\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-13 10:56+0100\n" -"PO-Revision-Date: 2004-09-29 17:35+0200\n" -"Last-Translator: Erik Schanze <[EMAIL PROTECTED]>\n" +"Project-Id-Version: backuppc_3.0.0-2_de\n" +"Report-Msgid-Bugs-To: [EMAIL PROTECTED],debian.org\n" +"POT-Creation-Date: 2007-02-16 04:30+0100\n" +"PO-Revision-Date: 2007-02-22 22:18+0100\n" +"Last-Translator: Erik Schanze <[EMAIL PROTECTED]>\n" "Language-Team: German <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.3.1\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: note #. Description -#: ../backuppc.templates:3 +#: ../backuppc.templates:1001 msgid "Web administration default user created" msgstr "Standard-Benutzer f??r die Web-Administration erstellt" #. Type: note #. Description -#: ../backuppc.templates:3 +#: ../backuppc.templates:1001 msgid "" "BackupPC can be managed through its web interface:\n" " http://${site}/backuppc/" msgstr "" -"BackupPC kann mit der Web-Oberfl??che verwaltet werden:\n" +"BackupPC kann mit seiner Web-Oberfl??che verwaltet werden:\n" " http://${site}/backuppc/" #. Type: note #. Description -#: ../backuppc.templates:3 +#: ../backuppc.templates:1001 msgid "" "For that purpose, a web user named 'backuppc' with '${pass}' as password has " "been created. You can change this password by running 'htpasswd /etc/" "backuppc/htpasswd backuppc'." msgstr "" -"Daf??r wurde ein Benutzer namens 'backuppc' mit '${pass}' als Passwort " -"eingerichtet. Sie sollten dieses Passwort so schnell wie m??glich durch das " +"Daf??r wurde ein Benutzer namens ??backuppc?? mit ??${pass}?? als Passwort " +"eingerichtet. Sie k??nnen dieses Passwort durch das " "Kommando 'htpasswd /etc/backuppc/htpasswd backuppc' ??ndern." #. Type: multiselect #. Description -#: ../backuppc.templates:15 +#: ../backuppc.templates:2001 msgid "Which web server would you like to reconfigure automatically:" -msgstr "" +msgstr "Welche Webserver wollen Sie automatisch neu einrichten:" #. Type: multiselect #. Description -#: ../backuppc.templates:15 +#: ../backuppc.templates:2001 msgid "" "BackupPC supports any web server with CGI enabled, but this automatic " "configuration process only supports Apache." msgstr "" +"BackupPC unterst??tzt jeden Webserver der CGI bietet, aber dieser " +"automatische Einrichtungsvorgang unterst??tzt nur Apache." #. Type: boolean #. Description -#: ../backuppc.templates:22 +#: ../backuppc.templates:3001 msgid "Do you want to restart the webservers now if needed?" -msgstr "" +msgstr "Wollen Sie die Webserver wenn n??tig jetzt neu starten?" #. Type: boolean #. Description -#: ../backuppc.templates:22 +#: ../backuppc.templates:3001 msgid "" "Remember that in order to activate the new configuration the webservers have " "to be restarted." msgstr "" +"Denken Sie daran, dass die Webserver neu gestartet werden m??ssen, " +"damit die neuen Einstellungen wirksam werden." -#~ msgid "Add aliases for /backuppc/ to your apache config files ?" -#~ msgstr "" -#~ "Den Konfigurationsdateien Ihres Apache Aliase f??r /backuppc/ hinzuf??gen?" - -#~ msgid "" -#~ "In order to have the Backuppc web administration interface working, I " -#~ "need to add an include line in your apache configuration, which will set-" -#~ "up a few aliases." -#~ msgstr "" -#~ "Damit die Web-Administrationsoberfl??che funktioniert, m??ssen Sie eine " -#~ "Zeile in Ihrer Apache-Konfiguration einf??gen, die einige Aliase erstellt." - -#~ msgid "" -#~ "If you do not trust automatically modified configurations, you can add " -#~ "the /etc/backuppc/apache.conf include file later yourself." -#~ msgstr "" -#~ "Wenn Sie dem nicht vertrauen, k??nnen Sie die Datei /etc/backuppc/apache." -#~ "conf sp??ter selbst einf??gen." diff -u backuppc-3.0.0/debian/po/cs.po backuppc-3.0.0/debian/po/cs.po --- backuppc-3.0.0/debian/po/cs.po +++ backuppc-3.0.0/debian/po/cs.po @@ -7,82 +7,86 @@ -"POT-Creation-Date: 2007-02-13 10:56+0100\n" -"PO-Revision-Date: 2005-04-12 21:58+0200\n" -"Last-Translator: Martin Sin <[EMAIL PROTECTED]>\n" +"POT-Creation-Date: 2007-02-16 04:30+0100\n" +"PO-Revision-Date: 2007-02-27 10:55+0100\n" +"Last-Translator: Martin Sin <[EMAIL PROTECTED]>\n" "Language-Team: Czech <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: note #. Description -#: ../backuppc.templates:3 +#: ../backuppc.templates:1001 msgid "Web administration default user created" -msgstr "Bylo vytvo?eno webov? rozran? s v?choz?m u?ivatelem" +msgstr "Bylo vytvo??eno webov?? rozhran?? s v??choz??m u??ivatelem" #. Type: note #. Description -#: ../backuppc.templates:3 +#: ../backuppc.templates:1001 msgid "" "BackupPC can be managed through its web interface:\n" " http://${site}/backuppc/" msgstr "" -"BackupPC m??ete ovl?dat p?es jeho webov? rozhran?:\n" +"BackupPC m????ete ovl??dat p??es jeho webov?? rozhran??:\n" " http://${site}/backuppc/" #. Type: note #. Description -#: ../backuppc.templates:3 +#: ../backuppc.templates:1001 msgid "" "For that purpose, a web user named 'backuppc' with '${pass}' as password has " "been created. You can change this password by running 'htpasswd /etc/" "backuppc/htpasswd backuppc'." msgstr "" -"K tomuto u?elu byl vytvo?en u?ivatel se jm?nem 'backuppc' a heslem " -"'${pass}'. Toto heslo m??ete zm?nit spu?t?n?m p??kazu 'htpasswd /etc/" +"K tomuto ????elu byl vytvo??en u??ivatel se jm??nem 'backuppc' a heslem " +"'${pass}'. Toto heslo m????ete zm??nit spu??t??n??m p????kazu 'htpasswd /etc/" "backuppc/htpasswd backuppc'." #. Type: multiselect #. Description -#: ../backuppc.templates:15 +#: ../backuppc.templates:2001 msgid "Which web server would you like to reconfigure automatically:" -msgstr "" +msgstr "Kter?? webserver si p??ejete nastavit automaticky:" #. Type: multiselect #. Description -#: ../backuppc.templates:15 +#: ../backuppc.templates:2001 msgid "" "BackupPC supports any web server with CGI enabled, but this automatic " "configuration process only supports Apache." msgstr "" +"BackupPC podporuje libovoln?? webserver s povolen??m CGI. Tento automatick?? " +"konfigura??n?? proces v??ak podporuje pouze Apache." #. Type: boolean #. Description -#: ../backuppc.templates:22 +#: ../backuppc.templates:3001 msgid "Do you want to restart the webservers now if needed?" -msgstr "" +msgstr "P??ejete si restartovat webov?? servery podle pot??eby?" #. Type: boolean #. Description -#: ../backuppc.templates:22 +#: ../backuppc.templates:3001 msgid "" "Remember that in order to activate the new configuration the webservers have " "to be restarted." msgstr "" +"Pamatujte, ??e je nutn?? pro na??ten?? nov?? konfigurace restartovat tak?? " +"webov?? server." #~ msgid "Add aliases for /backuppc/ to your apache config files ?" #~ msgstr "" -#~ "P?idat aliasy pro /backuppc/ do va?eho konfigura?n?ho souboru apache?" +#~ "P??idat aliasy pro /backuppc/ do va??eho konfigura??n??ho souboru apache?" #~ msgid "" #~ "In order to have the Backuppc web administration interface working, I " #~ "need to add an include line in your apache configuration, which will set-" #~ "up a few aliases." #~ msgstr "" -#~ "Pro zprovozn?n? administr?torsk?ho webov?ho rozhrann? Backuppc je pot?eba " -#~ "p?idat ??dek do konfigurace apache, kter? nastav? n?kolik alias?." +#~ "Pro zprovozn??n?? administr??torsk??ho webov??ho rozhrann?? Backuppc je pot??eba " +#~ "p??idat ????dek do konfigurace apache, kter?? nastav?? n??kolik alias??." #~ msgid "" #~ "If you do not trust automatically modified configurations, you can add " #~ "the /etc/backuppc/apache.conf include file later yourself." #~ msgstr "" -#~ "Jestli?e ned?v??ujete automaticky vytvo?en?m konfigurac?m, m??ete p?idat /" -#~ "etc/backuppc/apache.conf samostatn? pozd?ji." +#~ "Jestli??e ned??v????ujete automaticky vytvo??en??m konfigurac??m, m????ete p??idat /" +#~ "etc/backuppc/apache.conf samostatn?? pozd??ji." diff -u backuppc-3.0.0/debian/changelog backuppc-3.0.0/debian/changelog --- backuppc-3.0.0/debian/changelog +++ backuppc-3.0.0/debian/changelog @@ -1,3 +1,12 @@ +backuppc (3.0.0-2.1) unstable; urgency=high + + * Non-maintainer upload during BSP. + * Fix non-conditional use of debconf during purge (Closes: #416650). + * Updated German translation, thanks Erik Schanze (Closes: #412020). + * Updated Czech translation, thanks Martin Sin (Closes: #412729). + + -- Luk Claes <[EMAIL PROTECTED]> Thu, 17 May 2007 00:37:56 +0200 + backuppc (3.0.0-2) unstable; urgency=low * Bzip2 path changed. Closes: #410858 diff -u backuppc-3.0.0/debian/postrm backuppc-3.0.0/debian/postrm --- backuppc-3.0.0/debian/postrm +++ backuppc-3.0.0/debian/postrm @@ -17,40 +17,42 @@ # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package -. /usr/share/debconf/confmodule -db_version 2.0 - case "$1" in purge) - db_get backuppc/reconfigure-webserver - webservers="$RET" - db_get backuppc/restart-webserver - webservers_rst="$RET" - restart="" - inc="/etc/backuppc/apache.conf" - - for webserver in $webservers ; do - webserver=${webserver%,} - test -x /usr/sbin/$webserver || continue + if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_version 2.0 + + db_get backuppc/reconfigure-webserver + webservers="$RET" + db_get backuppc/restart-webserver + webservers_rst="$RET" + restart="" + inc="/etc/backuppc/apache.conf" + + for webserver in $webservers ; do + webserver=${webserver%,} + test -x /usr/sbin/$webserver || continue - case "$webserver" in - apache|apache-perl|apache-ssl|apache2) - # remove links - if [ -h /etc/$webserver/conf.d/backuppc ]; then - rm -f /etc/$webserver/conf.d/backuppc - if [ "$webservers_rst" = "true" ]; then - # restart - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d $webserver restart - else - /etc/init.d/$webserver restart - fi - fi - fi - ;; - esac - done + case "$webserver" in + apache|apache-perl|apache-ssl|apache2) + # remove links + if [ -h /etc/$webserver/conf.d/backuppc ]; then + rm -f /etc/$webserver/conf.d/backuppc + if [ "$webservers_rst" = "true" ]; then + # restart + if [ -x /usr/sbin/invoke-rc.d ]; then + invoke-rc.d $webserver restart + else + /etc/init.d/$webserver restart + fi + fi + fi + ;; + esac + done + fi dpkg-statoverride --remove --force /usr/share/backuppc/cgi-bin/index.cgi @@ -71,5 +73,9 @@ #DEBHELPER# -db_stop +if [ -f /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_version 2.0 + db_stop +fi exit 0