[Pkg-samba-maint] [samba] 01/04: Fix invocations of 'update-alternatives --remove-all'

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

idd-guest pushed a commit to branch master
in repository samba.

commit 49a03ba5b0c1eea38a2d4dcf5ad83adea08bd8a3
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Mon Dec 9 12:45:40 2013 +0100

    Fix invocations of 'update-alternatives --remove-all'
    
    based on commit 2e927d04 by jelmer
---
 debian/changelog                 | 3 +++
 debian/samba-common-bin.postinst | 6 +++---
 debian/samba.postinst            | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69f9aba..3b3696e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ samba (2:4.0.13+dfsg-1) UNRELEASED; urgency=low
     - CVE-2012-6150: pam_winbind login without require_membership_of
                      restrictions
 
+  [ Jelmer Vernooij ]
+  * Fix invocations of 'update-alternatives --remove-all'. Closes: #731192
+
  -- Steve Langasek <vorlon at debian.org>  Sun, 24 Nov 2013 19:06:20 -0800
 
 samba (2:4.0.12+dfsg-1) unstable; urgency=low
diff --git a/debian/samba-common-bin.postinst b/debian/samba-common-bin.postinst
index f4a9efd..1b5d7a0 100644
--- a/debian/samba-common-bin.postinst
+++ b/debian/samba-common-bin.postinst
@@ -3,9 +3,9 @@
 set -e 
 
 if dpkg --compare-versions "$2" lt-nl 2:4.0.12+dfsg-2~; then
-	update-alternatives --remove-all nmblookup /usr/bin/nmblookup.samba3
-	update-alternatives --remove-all net /usr/bin/net.samba3
-	update-alternatives --remove-all testparm /usr/bin/testparm.samba3
+	update-alternatives --remove-all nmblookup
+	update-alternatives --remove-all net
+	update-alternatives --remove-all testparm
 fi
 
 #DEBHELPER#
diff --git a/debian/samba.postinst b/debian/samba.postinst
index ceb437f..41d4466 100644
--- a/debian/samba.postinst
+++ b/debian/samba.postinst
@@ -40,7 +40,7 @@ if dpkg --compare-versions "$2" lt-nl 2:3.6.15-2; then
 fi
 
 if dpkg --compare-versions "$2" lt-nl 2:4.0.12+dfsg-2~; then
-	update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
+	update-alternatives --remove-all smbstatus
 fi
 
 # add the sambashare group

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git