[Pkg-samba-maint] r2511 - branches/samba/experimental/debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-25 20:16:19 +0000 (Sun, 25 Jan 2009)
New Revision: 2511

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/rules
   branches/samba/experimental/debian/samba-common.files
   branches/samba/experimental/debian/samba-common.postinst
   branches/samba/experimental/debian/samba-common.prerm
Log:
Use alternatives for net.

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2009-01-25 20:14:41 UTC (rev 2510)
+++ branches/samba/experimental/debian/changelog	2009-01-25 20:16:19 UTC (rev 2511)
@@ -1,7 +1,7 @@
 samba (2:3.3.0~rc2-5) experimental; urgency=low
 
-  * Use alternatives for nsstest, locktest, masktest, smbtatus, nmblookup and 
-  smbtorture to allow installation of Samba 3 together with Samba 4. 
+  * Use alternatives for nsstest, locktest, masktest, smbtatus, nmblookup,
+  net and smbtorture to allow installation of Samba 3 together with Samba 4. 
   * Add myself to uploaders.
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 25 Jan 2009 20:32:34 +0100

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2009-01-25 20:14:41 UTC (rev 2510)
+++ branches/samba/experimental/debian/rules	2009-01-25 20:16:19 UTC (rev 2511)
@@ -140,6 +140,7 @@
 	# Rename to *.samba3 for alternatives
 	mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba3
 	mv $(DESTDIR)/usr/bin/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba3
+	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba3
 
 	# Starting with Samba 3.0.6 libsmbclient.so is installed in
 	# /usr/lib/samba. We don't want it there since it is not in the

Modified: branches/samba/experimental/debian/samba-common.files
===================================================================
--- branches/samba/experimental/debian/samba-common.files	2009-01-25 20:14:41 UTC (rev 2510)
+++ branches/samba/experimental/debian/samba-common.files	2009-01-25 20:16:19 UTC (rev 2511)
@@ -1,8 +1,8 @@
 etc/samba/
 etc/dhcp3/
 etc/pam.d/
-usr/bin/net
-usr/bin/nmblookup.samba-common
+usr/bin/net.samba3
+usr/bin/nmblookup.samba3
 usr/bin/smbpasswd
 usr/bin/testparm
 usr/share/man/man1/nmblookup.1

Modified: branches/samba/experimental/debian/samba-common.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common.postinst	2009-01-25 20:14:41 UTC (rev 2510)
+++ branches/samba/experimental/debian/samba-common.postinst	2009-01-25 20:16:19 UTC (rev 2511)
@@ -7,6 +7,7 @@
 if [ "$1" = "configure" ]
 then
 	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3
+	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3
 fi
 
 # Do debconf stuff here

Modified: branches/samba/experimental/debian/samba-common.prerm
===================================================================
--- branches/samba/experimental/debian/samba-common.prerm	2009-01-25 20:14:41 UTC (rev 2510)
+++ branches/samba/experimental/debian/samba-common.prerm	2009-01-25 20:16:19 UTC (rev 2511)
@@ -5,6 +5,7 @@
 if [ "$1" = "configure" ]
 then
 	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
+	update-alternatives --remove net /usr/bin/net.samba3
 fi
 
 #DEBHELPER#