[Pkg-samba-maint] r2510 - trunk/samba4/debian

[jelmer at alioth.debian.org]

tags 506236 pending
thanks

Author: jelmer
Date: 2009-01-25 20:14:41 +0000 (Sun, 25 Jan 2009)
New Revision: 2510

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-clients.install
   trunk/samba4/debian/samba4-clients.postinst
   trunk/samba4/debian/samba4-clients.prerm
Log:
Use alternatives for net.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2009-01-25 20:11:46 UTC (rev 2509)
+++ trunk/samba4/debian/changelog	2009-01-25 20:14:41 UTC (rev 2510)
@@ -3,7 +3,7 @@
   * Add build dependency on libpopt-dev, so the system libpopt is always used 
     rather than the one included by Samba.
   * Use the alternatives system for smbtorture, nsstest, smbstatus, 
-    nmblookup, masktest and locktest. (Closes: #506236)
+    nmblookup, net, masktest and locktest. (Closes: #506236)
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 25 Jan 2009 20:17:16 +0100
 

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2009-01-25 20:11:46 UTC (rev 2509)
+++ trunk/samba4/debian/rules	2009-01-25 20:14:41 UTC (rev 2510)
@@ -72,6 +72,7 @@
 	mv $(DESTDIR)/usr/bin/masktest $(DESTDIR)/usr/bin/masktest.samba4
 	mv $(DESTDIR)/usr/bin/locktest $(DESTDIR)/usr/bin/locktest.samba4
 	mv $(DESTDIR)/usr/bin/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba4-clients
+	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba4
 	# Already provided by libparse-yapp-perl
 	rm -f $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# Binaries not ready for installation

Modified: trunk/samba4/debian/samba4-clients.install
===================================================================
--- trunk/samba4/debian/samba4-clients.install	2009-01-25 20:11:46 UTC (rev 2509)
+++ trunk/samba4/debian/samba4-clients.install	2009-01-25 20:14:41 UTC (rev 2510)
@@ -1,6 +1,6 @@
 usr/bin/getntacl
 usr/bin/cifsdd
-usr/bin/net
+usr/bin/net.samba4
 usr/bin/nmblookup.samba4-clients
 usr/bin/setnttoken
 usr/bin/smbclient

Modified: trunk/samba4/debian/samba4-clients.postinst
===================================================================
--- trunk/samba4/debian/samba4-clients.postinst	2009-01-25 20:11:46 UTC (rev 2509)
+++ trunk/samba4/debian/samba4-clients.postinst	2009-01-25 20:14:41 UTC (rev 2510)
@@ -5,6 +5,7 @@
 if [ "$1" = "configure" ]
 then
 	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba4-clients
+	update-alternatives --install /usr/bin/net net /usr/bin/net.samba4
 fi
 
 #DEBHELPER#

Modified: trunk/samba4/debian/samba4-clients.prerm
===================================================================
--- trunk/samba4/debian/samba4-clients.prerm	2009-01-25 20:11:46 UTC (rev 2509)
+++ trunk/samba4/debian/samba4-clients.prerm	2009-01-25 20:14:41 UTC (rev 2510)
@@ -5,6 +5,7 @@
 if [ "$1" = "configure" ]
 then
 	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba4-clients
+	update-alternatives --remove net /usr/bin/net.samba4
 fi
 
 #DEBHELPER#