Imported Debian patch 2.5.1p3-2

diff --git a/debian/changelog b/debian/changelog
index 6562fdd44863ed0fce5da267f157b2efd71d9798..7d94b9679cd23f1172e7816ee0ab29e34d6bb4cc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+amanda (1:2.5.1p3-2) unstable; urgency=low
+
+  * fold in diff from NMU of 1:2.5.1p1-2.1 by Peter Palfrader, closes: #399790
+    Do not fail postrm when removing the backup user from either
+    group disk or tape does not succeed.  Also, try this only
+    when the backup user is in those groups to begin with.  Also
+    handles the case of deluser not existing anymore.
+    Based in parts on the patch provided by Andreas Henriksson and
+    the cupsys postinst script.
+  * remove useless redundant clause in postrm, closes: #411739
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 21 Feb 2007 04:22:49 +0900
+
 amanda (1:2.5.1p3-1) unstable; urgency=low
 
   * new upstream version, closes: #402221

diff --git a/debian/po/ar.po b/debian/po/ar.po
index da9a5a25a92a7eb9c47e2e54289900d95d2e1482..9f2a7e1181e85ce4a4bf2dc72320d03d7472f3f0 100644 (file)
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda_1:2.4.5-1\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2005-07-19 18:48+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <debian-l10n-arabic@lists.debian.org>\n"

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 9abf66aa343f4478c75250bb1241724b65f6795e..4d464c29435867317f996e9cc2e43e378caeabae 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2006-06-04 17:06+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"

diff --git a/debian/po/da.po b/debian/po/da.po
index 4755431f8da681f23ea224abc0f30d020841d572..595b3acd592cd063a525f354ce2c56a5422d5988 100644 (file)
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/fr.po b/debian/po/fr.po
index c901316353ec4da8f060f57fd8d001862849a69f..4bc5b2d55ee3771773d32aa7c81efc0d0eb68c1b 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2006-05-28 17:13+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"

diff --git a/debian/po/it.po b/debian/po/it.po
index b3f0c5cc5cf68d02bbd359a801fb1fefac4abb89..7a28da0aba60c5f870d2e90552f94c129eed2722 100644 (file)
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda 1:2.5.0p2 italian debconf templates\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2006-05-30 10:30+0200\n"
 "Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"

diff --git a/debian/po/ja.po b/debian/po/ja.po
index 3dcd30fee6271eca336b40157a92dee7bb026ab3..16662c9418dec2863c2bd53bc818b537e4803b8f 100644 (file)
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda 2.5.0p2-2.1\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2006-10-11 00:08+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"

diff --git a/debian/po/nl.po b/debian/po/nl.po
index a1e6655a04232f11c580dc959707ea778171a1ff..ab673f617a24f7d348b26cec1067c07c131bf1e0 100644 (file)
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda 1:2.5.0p2-1\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2006-06-18 20:45+0100\n"
 "Last-Translator: Kurt De Bree <kdebree(AT)telenet(DOT)be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"

diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 357147f0c6e5faa9a6e35242a5f4a5c8dd8cece5..8692cebecf4c5fcfec2ce65701c91d15fe56c6ab 100644 (file)
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/ru.po b/debian/po/ru.po
index e1ab8c447fb828bab99a4a60ac26ecbca5533965..eb5017902bb2b47e166884c6f40aff824c0e07f9 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/sv.po b/debian/po/sv.po
index 686a5facec61d82019e7787244a26888721ccb9e..d374f1d39e2aafa901beab2d0703dcc95acbab6f 100644 (file)
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda 1:2.5.0p2-1\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2006-06-27 23:05+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index e47d205eae8ceae658f0bdbce80ef656f1eff471..b370142efd92e5e21bce75bc0e2f85db8a4e749a 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/debian/po/vi.po b/debian/po/vi.po
index 54c9a8683d6854955af2fd57330234eec7f79b77..ea539c0c63e4f6b18a29174558a8e7fe4981f08c 100644 (file)
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: amanda 1/2.4.4p3-2\n"
 "Report-Msgid-Bugs-To: bdale@gag.com\n"
-"POT-Creation-Date: 2007-02-20 13:12+0900\n"
+"POT-Creation-Date: 2007-02-21 04:27+0900\n"
 "PO-Revision-Date: 2005-05-05 13:29+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"

diff --git a/debian/postrm b/debian/postrm
index 6c4bba9a9f0ad231f6589d2c336feb2d9b008e43..9014b6ff66425e5004ffd6e8318db6a44652c33e 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,12 +1,6 @@
 #!/bin/sh -e
 case "$1" in
   purge)
-       if [ -d /etc/amanda ]; then
-               # remove all registered config files
-               rm -rf `cat /var/lib/dpkg/info/amanda-common.conffiles`
-               # remove /etc amanda if there are no files left
-               rmdir /etc/amanda 2> /dev/null || true
-       fi
        if [ -d /var/log/amanda ]; then
                rm -rf /var/log/amanda
        fi
@@ -27,8 +21,17 @@ case "$1" in
 
        rm -f ~backup/.amandahosts
 
-       deluser backup disk
-       deluser backup tape
+       if which deluser >/dev/null 2>&1 ; then
+               for group in disk tape; do
+                       # only call deluser when backup is in $group
+                       if getent group "$group" |
+                          awk -F: '{ print $4 }' |
+                          awk -F, '{ for (i=1; i <= NF; i++ ) print $i }' |
+                          grep '^backup$' > /dev/null; then
+                               deluser backup "$group" || true
+                       fi
+               done
+       fi
   ;;
   remove|upgrade|deconfigure)
   ;;