[Pkg-samba-maint] [samba] 01/02: Revert "Fix invocations of 'update-alternatives --remove-all' in samba- common-bin prerm. Closes: #731192"

[Jelmer Vernooij]

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

jelmer pushed a commit to branch samba_4.1
in repository samba.

commit 6df2c29685d49db059c44c324389000a9818db16
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Dec 6 22:24:51 2013 +0000

    Revert "Fix invocations of 'update-alternatives --remove-all' in samba- common-bin prerm. Closes: #731192"
    
    This reverts commit 2e927d0454cb6342903fccdd15e905cfbf15cd06.
---
 debian/changelog              | 2 --
 debian/samba-common-bin.prerm | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00d38ca..85a03f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,6 @@ samba (2:4.1.1+dfsg-1) UNRELEASED; urgency=low
   * Move service and process_model modules from the samba-libs to the
     samba package. Prevents dependencies on libkdc2-heimdal and
     libhdb9-heimdal.
-  * Fix invocations of 'update-alternatives --remove-all' in samba-
-    common-bin prerm. Closes: #731192
 
   [ Ivo De Decker ]
   * Add build-dep on python-ntdb.
diff --git a/debian/samba-common-bin.prerm b/debian/samba-common-bin.prerm
index 0b96a78..40f5553 100644
--- a/debian/samba-common-bin.prerm
+++ b/debian/samba-common-bin.prerm
@@ -3,9 +3,9 @@
 set -e 
 
 if test "x$1" = "xupgrade" ; then
-	update-alternatives --remove-all nmblookup
-	update-alternatives --remove-all net
-	update-alternatives --remove-all testparm
+	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
 fi
 
 #DEBHELPER#

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