From 5dface998916896fca0182a4c52a78877a691f5f Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Wed, 21 Feb 2007 04:22:49 +0900 Subject: [PATCH] Imported Debian patch 2.5.1p3-2 --- debian/changelog | 13 +++++++++++++ debian/po/ar.po | 2 +- debian/po/cs.po | 2 +- debian/po/da.po | 2 +- debian/po/fr.po | 2 +- debian/po/it.po | 2 +- debian/po/ja.po | 2 +- debian/po/nl.po | 2 +- debian/po/pt_BR.po | 2 +- debian/po/ru.po | 2 +- debian/po/sv.po | 2 +- debian/po/templates.pot | 2 +- debian/po/vi.po | 2 +- debian/postrm | 19 +++++++++++-------- 14 files changed, 36 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6562fdd..7d94b96 100644 --- 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 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 da9a5a2..9f2a7e1 100644 --- 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 \n" "Language-Team: Arabic \n" diff --git a/debian/po/cs.po b/debian/po/cs.po index 9abf66a..4d464c2 100644 --- 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 \n" "Language-Team: Czech \n" diff --git a/debian/po/da.po b/debian/po/da.po index 4755431..595b3ac 100644 --- 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 \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/fr.po b/debian/po/fr.po index c901316..4bc5b2d 100644 --- 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 \n" "Language-Team: French \n" diff --git a/debian/po/it.po b/debian/po/it.po index b3f0c5c..7a28da0 100644 --- 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 \n" "Language-Team: Italian \n" diff --git a/debian/po/ja.po b/debian/po/ja.po index 3dcd30f..16662c9 100644 --- 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) \n" "Language-Team: Japanese \n" diff --git a/debian/po/nl.po b/debian/po/nl.po index a1e6655..ab673f6 100644 --- 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 \n" "Language-Team: Debian l10n Dutch \n" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 357147f..8692ceb 100644 --- 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 \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/ru.po b/debian/po/ru.po index e1ab8c4..eb50179 100644 --- 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 \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/sv.po b/debian/po/sv.po index 686a5fa..d374f1d 100644 --- 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 \n" "Language-Team: Swedish \n" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index e47d205..b370142 100644 --- 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 \n" "Language-Team: LANGUAGE \n" diff --git a/debian/po/vi.po b/debian/po/vi.po index 54c9a86..ea539c0 100644 --- 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 \n" "Language-Team: Vietnamese \n" diff --git a/debian/postrm b/debian/postrm index 6c4bba9..9014b6f 100644 --- 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) ;; -- 2.30.2