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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-25 19:34:41 +0000 (Sun, 25 Jan 2009)
New Revision: 2505

Added:
   branches/samba/experimental/debian/samba-tools.postinst
   branches/samba/experimental/debian/samba-tools.prerm
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/rules
Log:
* Use alternatives for nsstest, locktest, masktest and smbtorture to allow
installation of samba-tools together with Samba 4. 
* Add myself to uploaders.

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

Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control	2009-01-25 19:34:16 UTC (rev 2504)
+++ branches/samba/experimental/debian/control	2009-01-25 19:34:41 UTC (rev 2505)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
-Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>
+Uploaders: Eloy A. Paris <peloy at debian.org>, Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>, Jelmer Vernooij <jelmer at debian.org>
 Build-Depends: debhelper, libpam0g-dev, libreadline5-dev, libcups2-dev | libcupsys2-dev, libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev, libtalloc-dev (>= 1.2.0~git20080616), libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
 Build-Conflicts: libfam-dev
 Standards-Version: 3.8.0
@@ -42,6 +42,7 @@
 Package: samba-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: samba4 (<< 4.0.0~alpha6-2), samba4-testsuite (<< 4.0.0~alpha6-2)
 Description: Samba testing utilities
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with

Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules	2009-01-25 19:34:16 UTC (rev 2504)
+++ branches/samba/experimental/debian/rules	2009-01-25 19:34:41 UTC (rev 2505)
@@ -151,12 +151,12 @@
 	install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
 	install -m 0644 source/nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
 	# Install torture stuff
-	install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
+	install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture.samba3
 	install -m 0755 source/bin/msgtest $(DESTDIR)/usr/bin/msgtest
-	install -m 0755 source/bin/masktest $(DESTDIR)/usr/bin/masktest
-	install -m 0755 source/bin/locktest $(DESTDIR)/usr/bin/locktest
+	install -m 0755 source/bin/masktest $(DESTDIR)/usr/bin/masktest.samba3
+	install -m 0755 source/bin/locktest $(DESTDIR)/usr/bin/locktest.samba3
 	install -m 0755 source/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
-	install -m 0755 source/bin/nsstest $(DESTDIR)/usr/bin/nsstest
+	install -m 0755 source/bin/nsstest $(DESTDIR)/usr/bin/nsstest.samba3
 	install -m 0755 source/bin/vfstest $(DESTDIR)/usr/bin/vfstest
 	install -m 0755 source/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
 	install -m 0755 source/bin/talloctort $(DESTDIR)/usr/bin/talloctort

Added: branches/samba/experimental/debian/samba-tools.postinst
===================================================================
--- branches/samba/experimental/debian/samba-tools.postinst	                        (rev 0)
+++ branches/samba/experimental/debian/samba-tools.postinst	2009-01-25 19:34:41 UTC (rev 2505)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+	update-alternatives --install /usr/bin/locktest locktest /usr/bin/locktest.samba3
+	update-alternatives --install /usr/bin/nsstest nsstest /usr/bin/nsstest.samba3
+	update-alternatives --install /usr/bin/masktest masktest /usr/bin/masktest.samba3
+	update-alternatives --install /usr/bin/smbtorture smbtorture /usr/bin/smbtorture.samba3
+fi
+
+#DEBHELPER#
+
+exit 0

Added: branches/samba/experimental/debian/samba-tools.prerm
===================================================================
--- branches/samba/experimental/debian/samba-tools.prerm	                        (rev 0)
+++ branches/samba/experimental/debian/samba-tools.prerm	2009-01-25 19:34:41 UTC (rev 2505)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ "$1" = "configure" ]
+then
+	update-alternatives --remove locktest /usr/bin/locktest.samba3
+	update-alternatives --remove nsstest nsstest /usr/bin/nsstest.samba3
+	update-alternatives --remove masktest /usr/bin/masktest.samba3
+	update-alternatives --remove smbtorture /usr/bin/smbtorture.samba3
+fi
+
+#DEBHELPER#
+
+exit 0