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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2010-09-07 08:32:21 +0000 (Tue, 07 Sep 2010)
New Revision: 3581

Modified:
   trunk/samba/debian/samba-common-bin.postinst
   trunk/samba/debian/samba.postinst
Log:
revert 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.postinst
===================================================================
--- trunk/samba/debian/samba-common-bin.postinst	2010-09-07 08:19:04 UTC (rev 3580)
+++ trunk/samba/debian/samba-common-bin.postinst	2010-09-07 08:32:21 UTC (rev 3581)
@@ -4,14 +4,11 @@
 
 set -e
 
-if [ "$1" = "configure" ]
-then
-	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
-		--slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
-	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
-		--slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
-	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
-		--slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
-fi
+update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
+	--slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
+update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
+	--slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
+update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
+	--slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
 
 #DEBHELPER#

Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst	2010-09-07 08:19:04 UTC (rev 3580)
+++ trunk/samba/debian/samba.postinst	2010-09-07 08:32:21 UTC (rev 3581)
@@ -4,23 +4,6 @@
 #
 #
 
-case "$1" in
-	configure)
-		update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10 \
-			--slave /usr/share/man/man1/smbstatus.1.gz smbstatus.1.gz /usr/share/man/man1/smbstatus.samba3.1.gz
-		# continue below
-	;;
-
-	abort-upgrade|abort-remove|abort-deconfigure)
-		exit 0
-	;;
-
-	*)
-		echo "postinst called with unknown argument \`$1'" >&2
-		exit 0
-	;;
-esac
-
 # Handle debconf
 . /usr/share/debconf/confmodule
 
@@ -139,6 +122,9 @@
 	install -d -m 1770 -g sambashare /var/lib/samba/usershares
 fi
 
+update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10 \
+	--slave /usr/share/man/man1/smbstatus.1.gz smbstatus.1.gz /usr/share/man/man1/smbstatus.samba3.1.gz
+
 #DEBHELPER#
 
 exit 0