[Pkg-samba-maint] r2516 - branches/samba/experimental/debian
jelmer at alioth.debian.org
jelmer at alioth.debian.org
Sun Jan 25 22:19:50 UTC 2009
Author: jelmer
Date: 2009-01-25 22:19:50 +0000 (Sun, 25 Jan 2009)
New Revision: 2516
Removed:
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
branches/samba/experimental/debian/samba-common.postinst
branches/samba/experimental/debian/samba.postinst
Log:
Remove use of alternatives for testing tools, use slaves for the manpages
of the various binaries now using alternatives.
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2009-01-25 22:19:23 UTC (rev 2515)
+++ branches/samba/experimental/debian/changelog 2009-01-25 22:19:50 UTC (rev 2516)
@@ -1,8 +1,8 @@
samba (2:3.3.0~rc2-5) experimental; urgency=low
- * Use alternatives for the nsstest, locktest, masktest, smbtatus, nmblookup,
- net, smbtorture and testparm binaries and various data files in samba-common
- to allow installation of Samba 3 together with Samba 4.
+ * Use alternatives for the smbtatus, nmblookup, net 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/control
===================================================================
--- branches/samba/experimental/debian/control 2009-01-25 22:19:23 UTC (rev 2515)
+++ branches/samba/experimental/debian/control 2009-01-25 22:19:50 UTC (rev 2516)
@@ -43,7 +43,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)
+Conflicts: samba4, samba4-testsuite
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
@@ -58,7 +58,7 @@
Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
Provides: samba-client
Suggests: smbfs
-Conflicts: samba4-clients (<< 4.0.0~alpha6-2)
+Conflicts: samba4-clients
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 22:19:23 UTC (rev 2515)
+++ branches/samba/experimental/debian/rules 2009-01-25 22:19:50 UTC (rev 2516)
@@ -140,8 +140,11 @@
# 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
+ mv $(DESTDIR)/usr/share/man/man1/nmblookup $(DESTDIR)/usr/share/man/man1/nmblookup.samba3.1
mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba3
+ mv $(DESTDIR)/usr/share/man/man1/net.1 $(DESTDIR)/usr/share/man/man1/net.samba3.1
mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba3
+ mv $(DESTDIR)/usr/share/man/man1/testparm $(DESTDIR)/usr/share/man/man1/testparm.samba3.1
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
@@ -161,12 +164,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.samba3
+ install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
install -m 0755 source/bin/msgtest $(DESTDIR)/usr/bin/msgtest
- 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/masktest $(DESTDIR)/usr/bin/masktest
+ install -m 0755 source/bin/locktest $(DESTDIR)/usr/bin/locktest
install -m 0755 source/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
- install -m 0755 source/bin/nsstest $(DESTDIR)/usr/bin/nsstest.samba3
+ install -m 0755 source/bin/nsstest $(DESTDIR)/usr/bin/nsstest
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
Modified: branches/samba/experimental/debian/samba-common.postinst
===================================================================
--- branches/samba/experimental/debian/samba-common.postinst 2009-01-25 22:19:23 UTC (rev 2515)
+++ branches/samba/experimental/debian/samba-common.postinst 2009-01-25 22:19:50 UTC (rev 2516)
@@ -6,14 +6,17 @@
if [ "$1" = "configure" ]
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
+ update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
+ --slave /usr/share/man/man1/nmblookup.1 nmblookup.1 /usr/share/man/man1/nmblookup.samba3.1
+ update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
+ --slave /usr/share/man/man1/net.1 net.1 /usr/share/man/man1/net.samba3.1
+ update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
+ --slave /usr/share/man/man1/testparm.1 testparm.1 /usr/share/man/man1/testparm.samba3.1
for N in valid.dat upcase.dat lowcase.dat
do
- update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba3
+ update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba3 0
done
- update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba3
+ update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba3 0
fi
# Do debconf stuff here
Deleted: branches/samba/experimental/debian/samba-tools.postinst
===================================================================
--- branches/samba/experimental/debian/samba-tools.postinst 2009-01-25 22:19:23 UTC (rev 2515)
+++ branches/samba/experimental/debian/samba-tools.postinst 2009-01-25 22:19:50 UTC (rev 2516)
@@ -1,15 +0,0 @@
-#!/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
Deleted: branches/samba/experimental/debian/samba-tools.prerm
===================================================================
--- branches/samba/experimental/debian/samba-tools.prerm 2009-01-25 22:19:23 UTC (rev 2515)
+++ branches/samba/experimental/debian/samba-tools.prerm 2009-01-25 22:19:50 UTC (rev 2516)
@@ -1,13 +0,0 @@
-#!/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
Modified: branches/samba/experimental/debian/samba.postinst
===================================================================
--- branches/samba/experimental/debian/samba.postinst 2009-01-25 22:19:23 UTC (rev 2515)
+++ branches/samba/experimental/debian/samba.postinst 2009-01-25 22:19:50 UTC (rev 2516)
@@ -6,7 +6,7 @@
case "$1" in
configure)
- update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3
+ update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba3 10
# continue below
;;
More information about the Pkg-samba-maint
mailing list