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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-25 20:11:46 +0000 (Sun, 25 Jan 2009)
New Revision: 2509

Added:
   branches/samba/experimental/debian/samba-common.prerm
   branches/samba/experimental/debian/samba.prerm
Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/control
   branches/samba/experimental/debian/rules
   branches/samba/experimental/debian/samba-common.files
   branches/samba/experimental/debian/samba-common.postinst
   branches/samba/experimental/debian/samba.files
   branches/samba/experimental/debian/samba.postinst
Log:
Use alternatives for smbstatus, nmblookup.

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2009-01-25 20:07:19 UTC (rev 2508)
+++ branches/samba/experimental/debian/changelog	2009-01-25 20:11:46 UTC (rev 2509)
@@ -1,7 +1,7 @@
 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. 
+  * Use alternatives for nsstest, locktest, masktest, smbtatus, nmblookup 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/control
===================================================================
--- branches/samba/experimental/debian/control	2009-01-25 20:07:19 UTC (rev 2508)
+++ branches/samba/experimental/debian/control	2009-01-25 20:11:46 UTC (rev 2509)
@@ -13,6 +13,7 @@
 Depends: samba-common (= ${binary:Version}), logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools
 Replaces: samba-common (<= 2.0.5a-2)
+Conflicts: samba (<< 4.0.0~alpha6-2)
 Description: SMB/CIFS file, print, and login server for Unix
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with
@@ -57,6 +58,7 @@
 Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
 Provides: samba-client
 Suggests: smbfs
+Conflicts: samba4-clients (<< 4.0.0~alpha6-2)
 Description: command-line SMB/CIFS clients for Unix
  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 20:07:19 UTC (rev 2508)
+++ branches/samba/experimental/debian/rules	2009-01-25 20:11:46 UTC (rev 2509)
@@ -137,6 +137,10 @@
 
 	$(MAKE) -C source install DESTDIR=$(DESTDIR)
 
+	# 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
+
 	# 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
 	# default library path. Here we move it to /usr/lib/.

Modified: branches/samba/experimental/debian/samba-common.files
===================================================================
--- branches/samba/experimental/debian/samba-common.files	2009-01-25 20:07:19 UTC (rev 2508)
+++ branches/samba/experimental/debian/samba-common.files	2009-01-25 20:11:46 UTC (rev 2509)
@@ -2,7 +2,7 @@
 etc/dhcp3/
 etc/pam.d/
 usr/bin/net
-usr/bin/nmblookup
+usr/bin/nmblookup.samba-common
 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:07:19 UTC (rev 2508)
+++ branches/samba/experimental/debian/samba-common.postinst	2009-01-25 20:11:46 UTC (rev 2509)
@@ -4,6 +4,11 @@
 
 set -e
 
+if [ "$1" = "configure" ]
+then
+	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3
+fi
+
 # Do debconf stuff here
 . /usr/share/debconf/confmodule
 

Added: branches/samba/experimental/debian/samba-common.prerm
===================================================================
--- branches/samba/experimental/debian/samba-common.prerm	                        (rev 0)
+++ branches/samba/experimental/debian/samba-common.prerm	2009-01-25 20:11:46 UTC (rev 2509)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "configure" ]
+then
+	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
+fi
+
+#DEBHELPER#
+
+exit 0

Modified: branches/samba/experimental/debian/samba.files
===================================================================
--- branches/samba/experimental/debian/samba.files	2009-01-25 20:07:19 UTC (rev 2508)
+++ branches/samba/experimental/debian/samba.files	2009-01-25 20:11:46 UTC (rev 2509)
@@ -1,5 +1,5 @@
 usr/bin/eventlogadm
-usr/bin/smbstatus
+usr/bin/smbstatus.samba3
 usr/bin/smbcontrol
 usr/bin/profiles
 usr/bin/tdbbackup

Modified: branches/samba/experimental/debian/samba.postinst
===================================================================
--- branches/samba/experimental/debian/samba.postinst	2009-01-25 20:07:19 UTC (rev 2508)
+++ branches/samba/experimental/debian/samba.postinst	2009-01-25 20:11:46 UTC (rev 2509)
@@ -6,6 +6,7 @@
 
 case "$1" in
 	configure)
+		update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3
 		# continue below
 	;;
 

Added: branches/samba/experimental/debian/samba.prerm
===================================================================
--- branches/samba/experimental/debian/samba.prerm	                        (rev 0)
+++ branches/samba/experimental/debian/samba.prerm	2009-01-25 20:11:46 UTC (rev 2509)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "configure" ]
+then
+	update-alternatives --remove smbstatus /usr/bin/smbstatus.samba3
+fi
+
+#DEBHELPER#
+
+exit 0