Remove alternatives which are no longer required in a merged package

diff --git a/debian/samba-common-bin.postinst b/debian/samba-common-bin.postinst
deleted file mode 100644 (file)
index 039b17f..0000000
--- a/debian/samba-common-bin.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-#
-
-set -e
-
-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#

diff --git a/debian/samba-common-bin.prerm b/debian/samba-common-bin.prerm
index 10a480de84232dce25f91d724c33939902a8ed4b..93b47421bbcb5efc9c7ef5a1e5f39e174320cddf 100644 (file)
--- a/debian/samba-common-bin.prerm
+++ b/debian/samba-common-bin.prerm
@@ -2,7 +2,7 @@
 
 set -e 
 
-if [ "x$1" != xupgrade ]; then
+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

diff --git a/debian/samba.postinst b/debian/samba.postinst
index 1f0348bae87b4658767b5f0315d902524d6549c4..2d720e737a22f00be899a8e29362deb2b20ddfeb 100644 (file)
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -109,9 +109,6 @@ then
        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

diff --git a/debian/samba.prerm b/debian/samba.prerm
index d0ae0f019e177bac11942944e81d89865921fc2a..019a3b2d9bcd5f2c5662d7a15b9a75ca8a06b0e2 100644 (file)
--- a/debian/samba.prerm
+++ b/debian/samba.prerm
@@ -2,7 +2,7 @@
 
 set -e 
 
-if [ "x$1" != xupgrade ]; then
+if [ "x$1" = xupgrade ]; then
        update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
 fi