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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-01-25 20:25:31 +0000 (Sun, 25 Jan 2009)
New Revision: 2512

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 for the data files in samba-common.

Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog	2009-01-25 20:16:19 UTC (rev 2511)
+++ branches/samba/experimental/debian/changelog	2009-01-25 20:25:31 UTC (rev 2512)
@@ -1,7 +1,8 @@
 samba (2:3.3.0~rc2-5) experimental; urgency=low
 
-  * Use alternatives for nsstest, locktest, masktest, smbtatus, nmblookup,
-  net and smbtorture to allow installation of Samba 3 together with Samba 4. 
+  * 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. 
   * 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:16:19 UTC (rev 2511)
+++ branches/samba/experimental/debian/rules	2009-01-25 20:25:31 UTC (rev 2512)
@@ -142,6 +142,10 @@
 	mv $(DESTDIR)/usr/bin/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba3
 	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.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
+	mv $(DESTDIR)/usr/share/samba/valid.dat $(DESTDIR)/usr/share/samba/valid.dat.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/.
@@ -179,7 +183,7 @@
 	ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
 
 	cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
-	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/
+	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action.samba3
 	# Install samba-common's conffiles - they'll get moved later to their
 	# correct place by dh_movefiles.
 	cp debian/gdbcommands $(DESTDIR)/etc/samba/

Modified: branches/samba/experimental/debian/samba-common.files
===================================================================
--- branches/samba/experimental/debian/samba-common.files	2009-01-25 20:16:19 UTC (rev 2511)
+++ branches/samba/experimental/debian/samba-common.files	2009-01-25 20:25:31 UTC (rev 2512)
@@ -13,8 +13,8 @@
 usr/share/man/man7/samba.7
 usr/share/man/man8/net.8
 usr/share/man/man8/smbpasswd.8
-usr/share/samba/lowcase.dat
-usr/share/samba/panic-action
+usr/share/samba/lowcase.dat.samba3
+usr/share/samba/panic-action.samba3
 usr/share/samba/smb.conf*
-usr/share/samba/upcase.dat
-usr/share/samba/valid.dat
+usr/share/samba/upcase.dat.samba3
+usr/share/samba/valid.dat.samba3

Modified: branches/samba/experimental/debian/samba-common.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common.postinst	2009-01-25 20:16:19 UTC (rev 2511)
+++ branches/samba/experimental/debian/samba-common.postinst	2009-01-25 20:25:31 UTC (rev 2512)
@@ -8,6 +8,11 @@
 then
 	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3
 	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3
+	for N in valid.dat upcase.dat lowcase.dat
+	do
+		update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba3
+	done
+	update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba3
 fi
 
 # Do debconf stuff here

Modified: branches/samba/experimental/debian/samba-common.prerm
===================================================================
--- branches/samba/experimental/debian/samba-common.prerm	2009-01-25 20:16:19 UTC (rev 2511)
+++ branches/samba/experimental/debian/samba-common.prerm	2009-01-25 20:25:31 UTC (rev 2512)
@@ -6,6 +6,11 @@
 then
 	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
 	update-alternatives --remove net /usr/bin/net.samba3
+	for N in valid.dat upcase.dat lowcase.dat
+	do
+		update-alternatives --remove $N /usr/share/samba/$N.samba3
+	done
+	update-alternatives --remove samba-panic-action /usr/share/samba/panic-action.samba3
 fi
 
 #DEBHELPER#