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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-25 19:46:54 +0000 (Sun, 25 Jan 2009)
New Revision: 2506

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-testsuite.install
   trunk/samba4/debian/samba4.install
   trunk/samba4/debian/samba4.postinst
   trunk/samba4/debian/samba4.prerm
Log:
Also handle smbstatus.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2009-01-25 19:34:41 UTC (rev 2505)
+++ trunk/samba4/debian/changelog	2009-01-25 19:46:54 UTC (rev 2506)
@@ -2,7 +2,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,
+  * Use the alternatives system for smbtorture, nsstest, smbstatus,
     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 19:34:41 UTC (rev 2505)
+++ trunk/samba4/debian/rules	2009-01-25 19:46:54 UTC (rev 2506)
@@ -67,6 +67,7 @@
 	# Alternatives are used
 	mv $(CURDIR)/debian/tmp/usr/bin/smbtorture $(CURDIR)/debian/tmp/usr/bin/smbtorture.samba4-testsuite
 	mv $(CURDIR)/debian/tmp/usr/bin/nsstest $(CURDIR)/debian/tmp/usr/bin/nsstest.samba4
+	mv $(CURDIR)/debian/tmp/usr/bin/smbstatus $(CURDIR)/debian/tmp/usr/bin/smbstatus.samba4
 	mv $(CURDIR)/debian/tmp/usr/bin/masktest $(CURDIR)/debian/tmp/usr/bin/masktest.samba4
 	mv $(CURDIR)/debian/tmp/usr/bin/locktest $(CURDIR)/debian/tmp/usr/bin/locktest.samba4
 	# Already provided by libparse-yapp-perl

Modified: trunk/samba4/debian/samba4-testsuite.install
===================================================================
--- trunk/samba4/debian/samba4-testsuite.install	2009-01-25 19:34:41 UTC (rev 2505)
+++ trunk/samba4/debian/samba4-testsuite.install	2009-01-25 19:46:54 UTC (rev 2506)
@@ -1,8 +1,8 @@
-usr/bin/smbtorture
+usr/bin/smbtorture.samba4-testsuite
 usr/bin/ndrdump
 usr/bin/gentest
-usr/bin/locktest
-usr/bin/masktest
+usr/bin/locktest.samba4-testsuite
+usr/bin/masktest.samba4-testsuite
 usr/share/man/man1/smbtorture.1
 usr/share/man/man1/ndrdump.1
 usr/share/man/man1/gentest.1

Modified: trunk/samba4/debian/samba4.install
===================================================================
--- trunk/samba4/debian/samba4.install	2009-01-25 19:34:41 UTC (rev 2505)
+++ trunk/samba4/debian/samba4.install	2009-01-25 19:46:54 UTC (rev 2506)
@@ -1,6 +1,6 @@
 usr/sbin/samba
-usr/bin/smbstatus
-usr/bin/nsstest
+usr/bin/smbstatus.samba4
+usr/bin/nsstest.samba4
 usr/lib/samba
 usr/share/samba/setup
 usr/share/man/man8/samba.8

Modified: trunk/samba4/debian/samba4.postinst
===================================================================
--- trunk/samba4/debian/samba4.postinst	2009-01-25 19:34:41 UTC (rev 2505)
+++ trunk/samba4/debian/samba4.postinst	2009-01-25 19:46:54 UTC (rev 2506)
@@ -6,6 +6,7 @@
 
 if [ "$1" = "configure" ]; then
 	update-alternatives --install /usr/bin/nsstest nsstest /usr/bin/nsstest.samba4
+	update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba4
 
 	# See if we're upgrading from Samba 3
 	if [ ! -z "$2" ]; then

Modified: trunk/samba4/debian/samba4.prerm
===================================================================
--- trunk/samba4/debian/samba4.prerm	2009-01-25 19:34:41 UTC (rev 2505)
+++ trunk/samba4/debian/samba4.prerm	2009-01-25 19:46:54 UTC (rev 2506)
@@ -4,6 +4,7 @@
 
 if [ "$1" = "configure" ]; then 
 	update-alternatives --remove nsstest /usr/bin/nsstest.samba4
+	update-alternatives --remove smbstatus /usr/bin/smbstatus.samba4
 fi
 
 #DEBHELPER#