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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-25 20:34:00 +0000 (Sun, 25 Jan 2009)
New Revision: 2514

Modified:
   branches/samba/experimental/debian/changelog
   branches/samba/experimental/debian/rules
   branches/samba/experimental/debian/samba-common.files
   branches/samba/experimental/debian/samba-common.postinst
   branches/samba/experimental/debian/samba-common.prerm
Log:
use alternatives handling for testparm.

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2009-01-25 20:32:24 UTC (rev 2513)
+++ branches/samba/experimental/debian/changelog	2009-01-25 20:34:00 UTC (rev 2514)
@@ -1,8 +1,8 @@
 samba (2:3.3.0~rc2-5) experimental; urgency=low
 
   * Use alternatives for the nsstest, locktest, masktest, smbtatus, nmblookup,
-  net and smbtorture binaries and various data files in samba-common to allow 
-  installation of Samba 3 together with Samba 4. 
+  net, smbtorture and testparm binaries and various data files in samba-common 
+  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/rules
===================================================================
--- branches/samba/experimental/debian/rules	2009-01-25 20:32:24 UTC (rev 2513)
+++ branches/samba/experimental/debian/rules	2009-01-25 20:34:00 UTC (rev 2514)
@@ -141,6 +141,7 @@
 	mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba3
 	mv $(DESTDIR)/usr/bin/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba3
 	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba3
+	mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba3
 
 	mv $(DESTDIR)/usr/share/samba/lowcase.dat $(DESTDIR)/usr/share/samba/lowcase.dat.samba3
 	mv $(DESTDIR)/usr/share/samba/upcase.dat $(DESTDIR)/usr/share/samba/upcase.dat.samba3

Modified: branches/samba/experimental/debian/samba-common.files
===================================================================
--- branches/samba/experimental/debian/samba-common.files	2009-01-25 20:32:24 UTC (rev 2513)
+++ branches/samba/experimental/debian/samba-common.files	2009-01-25 20:34:00 UTC (rev 2514)
@@ -4,7 +4,7 @@
 usr/bin/net.samba3
 usr/bin/nmblookup.samba3
 usr/bin/smbpasswd
-usr/bin/testparm
+usr/bin/testparm.samba3
 usr/share/man/man1/nmblookup.1
 usr/share/man/man1/testparm.1
 usr/share/man/man5/lmhosts.5

Modified: branches/samba/experimental/debian/samba-common.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common.postinst	2009-01-25 20:32:24 UTC (rev 2513)
+++ branches/samba/experimental/debian/samba-common.postinst	2009-01-25 20:34:00 UTC (rev 2514)
@@ -8,6 +8,7 @@
 then
 	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3
 	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3
+	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3
 	for N in valid.dat upcase.dat lowcase.dat
 	do
 		update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba3

Modified: branches/samba/experimental/debian/samba-common.prerm
===================================================================
--- branches/samba/experimental/debian/samba-common.prerm	2009-01-25 20:32:24 UTC (rev 2513)
+++ branches/samba/experimental/debian/samba-common.prerm	2009-01-25 20:34:00 UTC (rev 2514)
@@ -6,6 +6,7 @@
 then
 	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
 	update-alternatives --remove net /usr/bin/net.samba3
+	update-alternatives --remove testparm /usr/bin/testparm.samba3
 	for N in valid.dat upcase.dat lowcase.dat
 	do
 		update-alternatives --remove $N /usr/share/samba/$N.samba3