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

[jelmer at alioth.debian.org]

tags 506236 pending
thanks

Author: jelmer
Date: 2009-01-25 20:32:24 +0000 (Sun, 25 Jan 2009)
New Revision: 2513

Added:
   trunk/samba4/debian/samba4-common.prerm
Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-common.install
   trunk/samba4/debian/samba4-common.postinst
Log:
use alternatives for common data files.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2009-01-25 20:25:31 UTC (rev 2512)
+++ trunk/samba4/debian/changelog	2009-01-25 20:32:24 UTC (rev 2513)
@@ -2,8 +2,9 @@
 
   * 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, smbstatus, 
-    nmblookup, net, masktest and locktest. (Closes: #506236)
+  * Use the alternatives system for the smbtorture, nsstest, smbstatus, 
+    nmblookup, net, masktest, locktest and testparm binaries as well as 
+    various data files. (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 20:25:31 UTC (rev 2512)
+++ trunk/samba4/debian/rules	2009-01-25 20:32:24 UTC (rev 2513)
@@ -59,7 +59,7 @@
 	mkdir -p $(DESTDIR)/etc/samba
 	$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(DESTDIR)
 	$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(DESTDIR)
-	install -m 755 $(CURDIR)/debian/panic-action $(DESTDIR)/usr/share/samba
+	install -m 755 $(CURDIR)/debian/panic-action $(DESTDIR)/usr/share/samba/panic-action.samba4
 	install -m 644 $(CURDIR)/debian/gdbcommands $(DESTDIR)/etc/samba
 	dh_testdir
 	dh_testroot
@@ -73,6 +73,9 @@
 	mv $(DESTDIR)/usr/bin/locktest $(DESTDIR)/usr/bin/locktest.samba4
 	mv $(DESTDIR)/usr/bin/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba4-clients
 	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba4
+	mv $(DESTDIR)/usr/share/samba/valid.dat $(DESTDIR)/usr/share/samba/valid.dat.samba4
+	mv $(DESTDIR)/usr/share/samba/upcase.dat $(DESTDIR)/usr/share/samba/upcase.dat.samba4
+	mv $(DESTDIR)/usr/share/samba/lowcase.dat $(DESTDIR)/usr/share/samba/lowcase.dat.samba4
 	# Already provided by libparse-yapp-perl
 	rm -f $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# Binaries not ready for installation

Modified: trunk/samba4/debian/samba4-common.install
===================================================================
--- trunk/samba4/debian/samba4-common.install	2009-01-25 20:25:31 UTC (rev 2512)
+++ trunk/samba4/debian/samba4-common.install	2009-01-25 20:32:24 UTC (rev 2513)
@@ -1,4 +1,4 @@
 etc/samba/gdbcommands
-usr/bin/testparm
-usr/share/samba/*.dat
-usr/share/samba/panic-action
+usr/bin/testparm.samba4
+usr/share/samba/*.dat.samba4
+usr/share/samba/panic-action.samba4

Modified: trunk/samba4/debian/samba4-common.postinst
===================================================================
--- trunk/samba4/debian/samba4-common.postinst	2009-01-25 20:25:31 UTC (rev 2512)
+++ trunk/samba4/debian/samba4-common.postinst	2009-01-25 20:32:24 UTC (rev 2513)
@@ -5,6 +5,13 @@
 . /usr/share/debconf/confmodule
 
 if [ "$1" = "configure" ]; then
+	for N in upcase.dat valid.dat lowcase.dat
+	do 
+		update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba4
+	done
+	update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba4
+	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba4
+
 	# Don't overwrite an existing smb.conf file.
 	if [ -f /etc/samba/smb.conf ]; then
 		exit

Added: trunk/samba4/debian/samba4-common.prerm
===================================================================
--- trunk/samba4/debian/samba4-common.prerm	                        (rev 0)
+++ trunk/samba4/debian/samba4-common.prerm	2009-01-25 20:32:24 UTC (rev 2513)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	for N in upcase.dat valid.dat lowcase.dat
+	do 
+		update-alternatives --remove $N /usr/share/samba/$N.samba4
+	done
+	update-alternatives --remove samba-panic-action /usr/share/samba/panic-action.samba4
+	update-alternatives --remove testparm /usr/bin/testparm.samba4
+fi
+
+#DEBHELPER#
+
+exit 0