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

[jelmer at alioth.debian.org]

tags 506236 pending
thanks

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

Added:
   trunk/samba4/debian/samba4-clients.postinst
   trunk/samba4/debian/samba4-clients.prerm
Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-clients.install
Log:
Add alternatives for nmblookup.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2009-01-25 19:58:51 UTC (rev 2507)
+++ trunk/samba4/debian/changelog	2009-01-25 20:07:19 UTC (rev 2508)
@@ -2,8 +2,8 @@
 
   * 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,
-    masktest and locktest. (Closes: #506236)
+  * Use the alternatives system for smbtorture, nsstest, smbstatus, 
+    nmblookup, masktest and locktest. (Closes: #506236)
 
  -- Jelmer Vernooij <jelmer at debian.org>  Sun, 25 Jan 2009 20:17:16 +0100
 

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2009-01-25 19:58:51 UTC (rev 2507)
+++ trunk/samba4/debian/control	2009-01-25 20:07:19 UTC (rev 2508)
@@ -52,7 +52,7 @@
 Package: samba4-clients
 Architecture: any
 Depends: ${shlibs:Depends}, samba4-common (=${binary:Version}), ${misc:Depends}
-Conflicts: smbclient
+Conflicts: smbclient, samba-common (<< 2:3.3.0~rc2-5)
 Description: client utilities from Samba 4
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2009-01-25 19:58:51 UTC (rev 2507)
+++ trunk/samba4/debian/rules	2009-01-25 20:07:19 UTC (rev 2508)
@@ -71,6 +71,7 @@
 	mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba4
 	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
 	# 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 19:58:51 UTC (rev 2507)
+++ trunk/samba4/debian/samba4-clients.install	2009-01-25 20:07:19 UTC (rev 2508)
@@ -1,7 +1,7 @@
 usr/bin/getntacl
 usr/bin/cifsdd
 usr/bin/net
-usr/bin/nmblookup
+usr/bin/nmblookup.samba4-clients
 usr/bin/setnttoken
 usr/bin/smbclient
 usr/share/man/man1/getntacl.1

Added: trunk/samba4/debian/samba4-clients.postinst
===================================================================
--- trunk/samba4/debian/samba4-clients.postinst	                        (rev 0)
+++ trunk/samba4/debian/samba4-clients.postinst	2009-01-25 20:07:19 UTC (rev 2508)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba4-clients
+fi
+
+#DEBHELPER#
+
+exit 0

Added: trunk/samba4/debian/samba4-clients.prerm
===================================================================
--- trunk/samba4/debian/samba4-clients.prerm	                        (rev 0)
+++ trunk/samba4/debian/samba4-clients.prerm	2009-01-25 20:07:19 UTC (rev 2508)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba4-clients
+fi
+
+#DEBHELPER#
+
+exit 0