From 13d6d10aa48f1dfb956ccff2f72dbaa255073472 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <weasel@debian.org>
Date: Wed, 29 Nov 2006 01:57:01 +0100
Subject: [PATCH] Imported Debian patch 2.5.1p1-2.1

---
 config/config.sub       | 14 +++-----------
 debian/changelog        | 12 ++++++++++++
 debian/po/templates.pot |  2 +-
 debian/postrm           | 13 +++++++++++--
 4 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/config/config.sub b/config/config.sub
index fab0aa3..387c18d 100755
--- a/config/config.sub
+++ b/config/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2006-09-20'
+timestamp='2006-07-02'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -276,7 +276,6 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| score \
 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -285,7 +284,7 @@ case $basic_machine in
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
@@ -368,7 +367,7 @@ case $basic_machine in
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
@@ -910,10 +909,6 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1371,9 +1366,6 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
-		os=-elf
-		;;
         spu-*)
 		os=-elf
 		;;
diff --git a/debian/changelog b/debian/changelog
index 0bed6fe..257ea65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+amanda (1:2.5.1p1-2.1) unstable; urgency=medium
+
+  * Non maintainer upload.
+  * 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 (closes: #399790).
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 29 Nov 2006 01:57:01 +0100
+
 amanda (1:2.5.1p1-2) unstable; urgency=medium
 
   * fix broken way of setting default CLN_AMANDATES in client-src/clientconf.c
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index d2f6df8..229d55f 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: 2006-10-29 11:41-0700\n"
+"POT-Creation-Date: 2006-11-29 02:13+0100\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/postrm b/debian/postrm
index 6c4bba9..551a3cc 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -27,8 +27,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