[Pkg-samba-maint] r3582 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2010-09-07 08:34:29 +0000 (Tue, 07 Sep 2010)
New Revision: 3582

Removed:
   trunk/samba/debian/samba-common.prerm
Modified:
   trunk/samba/debian/samba-common-bin.prerm
   trunk/samba/debian/samba.prerm
Log:
revert more wrong changes to update-alternatives handling, which don't seem
to have come from the experimental branch at all

Modified: trunk/samba/debian/samba-common-bin.prerm
===================================================================
--- trunk/samba/debian/samba-common-bin.prerm	2010-09-07 08:32:21 UTC (rev 3581)
+++ trunk/samba/debian/samba-common-bin.prerm	2010-09-07 08:34:29 UTC (rev 3582)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e 
+
+if [ "x$1" != xupgrade ]; then
+	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
+	update-alternatives --remove net /usr/bin/net.samba3
+	update-alternatives --remove testparm /usr/bin/testparm.samba3
+fi
+
+#DEBHELPER#
+
+exit 0

Deleted: trunk/samba/debian/samba-common.prerm
===================================================================
--- trunk/samba/debian/samba-common.prerm	2010-09-07 08:32:21 UTC (rev 3581)
+++ trunk/samba/debian/samba-common.prerm	2010-09-07 08:34:29 UTC (rev 3582)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e 
-
-case "$1" in
-    remove|upgrade|deconfigure)
-	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
-	update-alternatives --remove net /usr/bin/net.samba3
-	update-alternatives --remove testparm /usr/bin/testparm.samba3
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0

Modified: trunk/samba/debian/samba.prerm
===================================================================
--- trunk/samba/debian/samba.prerm	2010-09-07 08:32:21 UTC (rev 3581)
+++ trunk/samba/debian/samba.prerm	2010-09-07 08:34:29 UTC (rev 3582)
@@ -2,11 +2,9 @@
 
 set -e 
 
-case "$1" in
-    remove|upgrade|deconfigure)
+if [ "x$1" != xupgrade ]; then
 	update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
-	;;
-esac
+fi
 
 #DEBHELPER#