[Pkg-samba-maint] r2515 - trunk/samba4/debian
jelmer at alioth.debian.org
jelmer at alioth.debian.org
Sun Jan 25 22:19:23 UTC 2009
tags 506236 pending
thanks
Author: jelmer
Date: 2009-01-25 22:19:23 +0000 (Sun, 25 Jan 2009)
New Revision: 2515
Removed:
trunk/samba4/debian/samba4-testsuite.postinst
trunk/samba4/debian/samba4-testsuite.prerm
Modified:
trunk/samba4/debian/changelog
trunk/samba4/debian/control
trunk/samba4/debian/rules
trunk/samba4/debian/samba4-clients.install
trunk/samba4/debian/samba4-clients.postinst
trunk/samba4/debian/samba4-clients.prerm
trunk/samba4/debian/samba4-common.postinst
trunk/samba4/debian/samba4-testsuite.install
trunk/samba4/debian/samba4.install
trunk/samba4/debian/samba4.postinst
trunk/samba4/debian/samba4.prerm
Log:
Remove use of alternatives for testing tools, use slaves for the manpages
of the various binaries now using alternatives.
Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/changelog 2009-01-25 22:19:23 UTC (rev 2515)
@@ -2,9 +2,10 @@
* 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 the smbtorture, nsstest, smbstatus,
- nmblookup, net, masktest, locktest and testparm binaries as well as
- various data files. (Closes: #506236)
+ * Use the alternatives system for the smbstatus, nmblookup, net and testparm
+ binaries as well as various data files.
+ * Make the samba4 and samba4-testsuite packages conflict with
+ samba-tools. (Closes: #506236)
-- Jelmer Vernooij <jelmer at debian.org> Sun, 25 Jan 2009 20:17:16 +0100
Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/control 2009-01-25 22:19:23 UTC (rev 2515)
@@ -14,7 +14,7 @@
Package: samba4
Architecture: any
Recommends: samba-ldb-tools
-Conflicts: samba, samba-tools (<< 2:3.3.0~rc2-5)
+Conflicts: samba, samba-tools
Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common (=${binary:Version}), python, python-samba
XB-Python-Version: ${python:Versions}
Description: LanManager-like file server for Unix (version 4)
@@ -68,7 +68,7 @@
Package: samba4-testsuite
Architecture: any
-Conflicts: samba-tools (<< 2:3.3.0~rc2-5)
+Conflicts: samba-tools
Depends: ${shlibs:Depends}, samba4-common, ${misc:Depends}
Description: test suite from Samba 4
The Samba software suite is a collection of programs that
Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/rules 2009-01-25 22:19:23 UTC (rev 2515)
@@ -66,13 +66,11 @@
# Remove files created when running install more than once
find $(DESTDIR) -name "*.old" | xargs rm -f
# Alternatives are used
- mv $(DESTDIR)/usr/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture.samba4-testsuite
- mv $(DESTDIR)/usr/bin/nsstest $(DESTDIR)/usr/bin/nsstest.samba4
mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba4
- mv $(DESTDIR)/usr/bin/masktest $(DESTDIR)/usr/bin/masktest.samba4
- 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/nmblookup $(DESTDIR)/usr/bin/nmblookup.samba4
+ mv $(DESTDIR)/usr/share/man/man1/nmblookup.1 $(DESTDIR)/usr/share/man/man1/nmblookup.samba4.1
mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba4
+ mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.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
Modified: trunk/samba4/debian/samba4-clients.install
===================================================================
--- trunk/samba4/debian/samba4-clients.install 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4-clients.install 2009-01-25 22:19:23 UTC (rev 2515)
@@ -1,8 +1,8 @@
usr/bin/getntacl
usr/bin/cifsdd
usr/bin/net.samba4
-usr/bin/nmblookup.samba4-clients
+usr/bin/nmblookup.samba4
usr/bin/setnttoken
usr/bin/smbclient
usr/share/man/man1/getntacl.1
-usr/share/man/man1/nmblookup.1
+usr/share/man/man1/nmblookup.samba4.1
Modified: trunk/samba4/debian/samba4-clients.postinst
===================================================================
--- trunk/samba4/debian/samba4-clients.postinst 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4-clients.postinst 2009-01-25 22:19:23 UTC (rev 2515)
@@ -4,8 +4,11 @@
if [ "$1" = "configure" ]
then
- update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba4-clients
- update-alternatives --install /usr/bin/net net /usr/bin/net.samba4
+ update-alternatives --install \
+ /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba4 10 \
+ --slave /usr/share/man/man1/nmblookup.1 nmblookup.1 \
+ /usr/share/man/man1/nmblookup.samba4.1
+ update-alternatives --install /usr/bin/net net /usr/bin/net.samba4 0
fi
#DEBHELPER#
Modified: trunk/samba4/debian/samba4-clients.prerm
===================================================================
--- trunk/samba4/debian/samba4-clients.prerm 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4-clients.prerm 2009-01-25 22:19:23 UTC (rev 2515)
@@ -4,7 +4,7 @@
if [ "$1" = "configure" ]
then
- update-alternatives --remove nmblookup /usr/bin/nmblookup.samba4-clients
+ update-alternatives --remove nmblookup /usr/bin/nmblookup.samba4
update-alternatives --remove net /usr/bin/net.samba4
fi
Modified: trunk/samba4/debian/samba4-common.postinst
===================================================================
--- trunk/samba4/debian/samba4-common.postinst 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4-common.postinst 2009-01-25 22:19:23 UTC (rev 2515)
@@ -7,10 +7,10 @@
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
+ update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba4 0
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
+ update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba4 0
+ update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba4 0
# Don't overwrite an existing smb.conf file.
if [ -f /etc/samba/smb.conf ]; then
Modified: trunk/samba4/debian/samba4-testsuite.install
===================================================================
--- trunk/samba4/debian/samba4-testsuite.install 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4-testsuite.install 2009-01-25 22:19:23 UTC (rev 2515)
@@ -1,8 +1,8 @@
-usr/bin/smbtorture.samba4-testsuite
+usr/bin/smbtorture
usr/bin/ndrdump
usr/bin/gentest
-usr/bin/locktest.samba4-testsuite
-usr/bin/masktest.samba4-testsuite
+usr/bin/locktest
+usr/bin/masktest
usr/share/man/man1/smbtorture.1
usr/share/man/man1/ndrdump.1
usr/share/man/man1/gentest.1
Deleted: trunk/samba4/debian/samba4-testsuite.postinst
===================================================================
--- trunk/samba4/debian/samba4-testsuite.postinst 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4-testsuite.postinst 2009-01-25 22:19:23 UTC (rev 2515)
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/smbtorture smbtorture /usr/bin/smbtorture.samba4-testsuite
- update-alternatives --install /usr/bin/locktest locktest /usr/bin/locktest.samba4-testsuite
- update-alternatives --install /usr/bin/masktest masktest /usr/bin/masktest.samba4-testsuite
-fi
-
-#DEBHELPER#
-
-exit 0
Deleted: trunk/samba4/debian/samba4-testsuite.prerm
===================================================================
--- trunk/samba4/debian/samba4-testsuite.prerm 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4-testsuite.prerm 2009-01-25 22:19:23 UTC (rev 2515)
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- update-alternatives --remove smbtorture /usr/bin/smbtorture.samba4-testsuite
- update-alternatives --remove masktest /usr/bin/masktest.samba4-testsuite
- update-alternatives --remove locktest /usr/bin/locktest.samba4-testsuite
-fi
-
-#DEBHELPER#
-
-exit 0
Modified: trunk/samba4/debian/samba4.install
===================================================================
--- trunk/samba4/debian/samba4.install 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4.install 2009-01-25 22:19:23 UTC (rev 2515)
@@ -1,6 +1,6 @@
usr/sbin/samba
usr/bin/smbstatus.samba4
-usr/bin/nsstest.samba4
+usr/bin/nsstest
usr/lib/samba
usr/share/samba/setup
usr/share/man/man8/samba.8
Modified: trunk/samba4/debian/samba4.postinst
===================================================================
--- trunk/samba4/debian/samba4.postinst 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4.postinst 2009-01-25 22:19:23 UTC (rev 2515)
@@ -5,8 +5,7 @@
. /usr/share/debconf/confmodule
if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/nsstest nsstest /usr/bin/nsstest.samba4
- update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba4
+ update-alternatives --install /usr/bin/smbstatus smbstatus /usr/bin/smbstatus.samba4 0
# See if we're upgrading from Samba 3
if [ ! -z "$2" ]; then
Modified: trunk/samba4/debian/samba4.prerm
===================================================================
--- trunk/samba4/debian/samba4.prerm 2009-01-25 20:34:00 UTC (rev 2514)
+++ trunk/samba4/debian/samba4.prerm 2009-01-25 22:19:23 UTC (rev 2515)
@@ -3,7 +3,6 @@
set -e
if [ "$1" = "configure" ]; then
- update-alternatives --remove nsstest /usr/bin/nsstest.samba4
update-alternatives --remove smbstatus /usr/bin/smbstatus.samba4
fi
More information about the Pkg-samba-maint
mailing list