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

jelmer at alioth.debian.org jelmer at alioth.debian.org
Tue Jun 2 13:07:19 UTC 2009


Author: jelmer
Date: 2009-06-02 13:07:19 +0000 (Tue, 02 Jun 2009)
New Revision: 2799

Added:
   trunk/samba4/debian/samba4-common-bin.dirs
   trunk/samba4/debian/samba4-common-bin.install
   trunk/samba4/debian/samba4-common-bin.postinst
   trunk/samba4/debian/samba4-common-bin.prerm
Removed:
   trunk/samba4/debian/gdbcommands
   trunk/samba4/debian/panic-action
   trunk/samba4/debian/samba4-common.config
   trunk/samba4/debian/samba4-common.dirs
   trunk/samba4/debian/samba4-common.files
   trunk/samba4/debian/samba4-common.install
   trunk/samba4/debian/samba4-common.postinst
   trunk/samba4/debian/samba4-common.postrm
   trunk/samba4/debian/samba4-common.prerm
   trunk/samba4/debian/samba4-common.templates
Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/rules
Log:
* Reorganization to let Samba 3 and Samba 4 co-exist on the same system:
 + Depend on samba-common for smb.conf, /etc/samba/gdbcommands,
   /usr/share/samba/{panic-action,*.dat}.
 + Rename samba4-common to samba4-common-bin.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/changelog	2009-06-02 13:07:19 UTC (rev 2799)
@@ -4,8 +4,12 @@
   * Add missing dependency on tdb >= 1.1.3. (Closes: #517171)
   * New upstream release.
   * Bump standards version to 3.8.1.
+  * Reorganization to let Samba 3 and Samba 4 co-exist on the same system:
+   + Depend on samba-common for smb.conf, /etc/samba/gdbcommands,
+     /usr/share/samba/{panic-action,*.dat}.
+   + Rename samba4-common to samba4-common-bin.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Thu, 21 May 2009 18:03:32 +0200
+ -- Jelmer Vernooij <jelmer at debian.org>  Thu, 21 May 2009 18:07:36 +0200
 
 samba4 (4.0.0~alpha7~20090225-1) experimental; urgency=low
 

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/control	2009-06-02 13:07:19 UTC (rev 2799)
@@ -5,7 +5,7 @@
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Steinar H. Gunderson <sesse at debian.org>, Jelmer Vernooij <jelmer at debian.org>
 Homepage: http://www.samba.org/
 Standards-Version: 3.8.1
-Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.3), libtalloc-dev, libtevent-dev (>> 0.9.3~), perl-modules, python-dev, python-central (>= 0.5.6), quilt, libpopt-dev, pkg-config
+Build-Depends: debhelper (>> 5.0.0), libparse-yapp-perl, perl, docbook-xsl, docbook-xml, xsltproc, po-debconf, libgnutls-dev, libreadline5-dev, libpam0g-dev, libblkid-dev, libattr1-dev, flex, bison, tdb-dev (>= 1.1.3), libtalloc-dev, libtevent-dev (>> 0.9.3~), perl-modules, python-dev, python-central (>= 0.5.6), quilt, libpopt-dev, pkg-config, samba-common
 Build-Conflicts: libldb-dev
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/branches/samba4
 XS-Python-Version: current
@@ -15,7 +15,7 @@
 Architecture: any
 Recommends: samba-ldb-tools
 Conflicts: samba-tools, samba (<< 2:3.3.0~rc2-5)
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common (=${binary:Version}), python, python-samba
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common-bin (=${binary:Version}), python, python-samba
 XB-Python-Version: ${python:Versions}
 Description: LanManager-like file server for Unix (version 4)
  The Samba software suite is a collection of programs that
@@ -30,9 +30,9 @@
  .
  This package contains smbd, the Samba file, print and domain server.
 
-Package: samba4-common
+Package: samba4-common-bin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.3.4-3)
 Conflicts: samba (<< 2:3.3.0~rc2-5), samba-common (<< 2:3.3.0~rc2-5)
 Description: Samba 4 common files used by both the server and the client
  The Samba software suite is a collection of programs that
@@ -51,7 +51,7 @@
 
 Package: samba4-clients
 Architecture: any
-Depends: ${shlibs:Depends}, samba4-common (=${binary:Version}), ${misc:Depends}
+Depends: ${shlibs:Depends}, samba4-common-bin (=${binary:Version}), ${misc:Depends}
 Conflicts: smbclient, samba-common (<< 2:3.3.0~rc2-5)
 Description: client utilities from Samba 4
  The Samba software suite is a collection of programs that
@@ -69,7 +69,7 @@
 Package: samba4-testsuite
 Architecture: any
 Conflicts: samba-tools
-Depends: ${shlibs:Depends}, samba4-common, ${misc:Depends}
+Depends: ${shlibs:Depends}, samba4-common-bin, ${misc:Depends}
 Description: test suite from Samba 4
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve
@@ -177,7 +177,7 @@
 Architecture: any
 Conflicts: libldb0
 Provides: libldb0
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.3.4-3)
 Description: LDAP-like embedded database - Samba 4 version
  ldb is a LDAP-like embedded database built on top of TDB.
  .
@@ -191,7 +191,7 @@
 
 Package: libgensec0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.3.4-3)
 Description: Generic Security Library
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve

Deleted: trunk/samba4/debian/gdbcommands
===================================================================
--- trunk/samba4/debian/gdbcommands	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/gdbcommands	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,2 +0,0 @@
-bt
-quit

Deleted: trunk/samba4/debian/panic-action
===================================================================
--- trunk/samba4/debian/panic-action	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/panic-action	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# Redirect all output to our mail command
-(
-	# We must be given a pid to look at
-	if [ -z "$1" ]; then
-		echo "$0 called with no arguments."
-		exit 1
-	fi
-
-	if [ ! -d "/proc/$1" ]; then
-		echo "$0: No such process: $1"
-		exit 1
-	fi
-
-	# Find out what binary we're debugging
-	BINARYNAME=`readlink "/proc/$1/exe"`
-
-	# Generic header for our email
-	echo "The Samba 'panic action' script, $0,"
-	echo "was called for pid $1 ($BINARYNAME)."
-	echo
-
-	if [ -z "$BINARYNAME" ]; then
-		echo "This means there was a problem with the program, such as a segfault."
-		echo "However, the executable could not be found for process $1."
-		echo "It may have died unexpectedly, or you may not have permission to"
-		echo "debug the process."
-		exit 1
-	fi
-
-	# No debugger
-	if [ ! -x /usr/bin/gdb ]; then
-		echo "This means there was a problem with the program, such as a segfault."
-		echo "However, gdb was not found on your system, so the error could not be"
-		echo "debugged.  Please install the gdb package so that debugging information is"
-		echo "available the next time such a problem occurs."
-		exit 1
-	fi
-
-	echo "Below is a backtrace for this process generated with gdb, which shows"
-	echo "the state of the program at the time the error occurred. "
-	echo 
-	echo "If the problem persists, you are encouraged to first install the "
-	echo "samba-dbg package which contains the debugging symbols for samba "
-	echo "binaries. The, submit the provided information as a bug report to Debian.  For"
-	echo "information about the procedure for submitting bug reports , please see"
-	echo "http://www.debian.org/Bugs/Reporting or the reportbug(1) manpage."
-	echo
-	gdb -x /etc/samba/gdbcommands -batch "$BINARYNAME" "$1"
-) | mail -s "Segfault in Samba" root

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/rules	2009-06-02 13:07:19 UTC (rev 2799)
@@ -65,8 +65,6 @@
 	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/panic-action.samba4
-	install -m 644 $(CURDIR)/debian/gdbcommands $(DESTDIR)/etc/samba
 	dh_testdir
 	dh_testroot
 	# Remove files created when running install more than once
@@ -77,9 +75,7 @@
 	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
+	rm -f $(DESTDIR)/usr/share/samba/*.dat
 	# Already provided by libparse-yapp-perl
 	rm -f $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# Binaries not ready for installation

Copied: trunk/samba4/debian/samba4-common-bin.dirs (from rev 2798, trunk/samba4/debian/samba4-common.dirs)
===================================================================
--- trunk/samba4/debian/samba4-common-bin.dirs	                        (rev 0)
+++ trunk/samba4/debian/samba4-common-bin.dirs	2009-06-02 13:07:19 UTC (rev 2799)
@@ -0,0 +1,4 @@
+etc/samba/tls
+usr/lib/samba
+var/cache/samba
+var/run/samba

Copied: trunk/samba4/debian/samba4-common-bin.install (from rev 2798, trunk/samba4/debian/samba4-common.install)
===================================================================
--- trunk/samba4/debian/samba4-common-bin.install	                        (rev 0)
+++ trunk/samba4/debian/samba4-common-bin.install	2009-06-02 13:07:19 UTC (rev 2799)
@@ -0,0 +1 @@
+usr/bin/testparm.samba4

Copied: trunk/samba4/debian/samba4-common-bin.postinst (from rev 2798, trunk/samba4/debian/samba4-common.postinst)
===================================================================
--- trunk/samba4/debian/samba4-common-bin.postinst	                        (rev 0)
+++ trunk/samba4/debian/samba4-common-bin.postinst	2009-06-02 13:07:19 UTC (rev 2799)
@@ -0,0 +1,9 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba4 0
+fi
+
+#DEBHELPER#

Copied: trunk/samba4/debian/samba4-common-bin.prerm (from rev 2798, trunk/samba4/debian/samba4-common.prerm)
===================================================================
--- trunk/samba4/debian/samba4-common-bin.prerm	                        (rev 0)
+++ trunk/samba4/debian/samba4-common-bin.prerm	2009-06-02 13:07:19 UTC (rev 2799)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in 
+    remove|upgrade|deconfigure)
+		update-alternatives --remove testparm /usr/bin/testparm.samba4
+		;;
+esac
+
+#DEBHELPER#
+
+exit 0

Deleted: trunk/samba4/debian/samba4-common.config
===================================================================
--- trunk/samba4/debian/samba4-common.config	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/samba4-common.config	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-db_title "Samba Server"
-
-#
-# See if we have an smb.conf. If not, we ask for realm and domain
-# so we can generate a new one.
-#
-if [ ! -f /etc/samba/smb.conf ]; then
-	db_input medium samba4-common/realm || true
-	db_go || true
-
-	db_input medium samba4-common/domain || true
-	db_go || true
-fi
-

Deleted: trunk/samba4/debian/samba4-common.dirs
===================================================================
--- trunk/samba4/debian/samba4-common.dirs	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/samba4-common.dirs	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,5 +0,0 @@
-etc/samba/tls
-usr/lib/samba
-usr/share/samba
-var/cache/samba
-var/run/samba

Deleted: trunk/samba4/debian/samba4-common.install
===================================================================
--- trunk/samba4/debian/samba4-common.install	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/samba4-common.install	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,4 +0,0 @@
-etc/samba/gdbcommands
-usr/bin/testparm.samba4
-usr/share/samba/*.dat.samba4
-usr/share/samba/panic-action.samba4

Deleted: trunk/samba4/debian/samba4-common.postinst
===================================================================
--- trunk/samba4/debian/samba4-common.postinst	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/samba4-common.postinst	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,39 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. /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 0
-	done
-	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
-		exit
-	fi
-
-	db_get samba-common/realm || true
-	REALM="$RET"
-
-	db_get samba-common/domain || true
-	DOMAIN="$RET"
-
-	HOSTNAME=$( hostname -s )
-
-	if [ -n "$REALM" -a -n "$DOMAIN" ]; then
-		cat <<EOF >/etc/samba/smb.conf
-[globals]
-	netbios name    = $HOSTNAME
-	workgroup       = $DOMAIN
-	realm           = $REALM
-	panic action	= /usr/share/samba/panic-action
-EOF
-	fi
-fi
-
-#DEBHELPER#

Deleted: trunk/samba4/debian/samba4-common.postrm
===================================================================
--- trunk/samba4/debian/samba4-common.postrm	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/samba4-common.postrm	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = purge ]; then
-	# Remove any files left in /etc/samba/
-	rm -Rf /etc/samba/
-fi
-
-#DEBHELPER#

Deleted: trunk/samba4/debian/samba4-common.prerm
===================================================================
--- trunk/samba4/debian/samba4-common.prerm	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/samba4-common.prerm	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in 
-    remove|upgrade|deconfigure)
-		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
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0

Deleted: trunk/samba4/debian/samba4-common.templates
===================================================================
--- trunk/samba4/debian/samba4-common.templates	2009-06-02 13:07:17 UTC (rev 2798)
+++ trunk/samba4/debian/samba4-common.templates	2009-06-02 13:07:19 UTC (rev 2799)
@@ -1,12 +0,0 @@
-Template: samba4-common/realm
-Type: string
-# Translators, "Realm" here stands for a Kerberos realm
-_Description: Realm:
- Please specify the Kerberos realm this server will be in. In many cases, 
- this will be the same as the DNS domain name.
-
-Template: samba4-common/domain
-Type: string
-_Description: Domain Name:
- Please specify the domain you want this server to appear to be in
- when queried by clients. 




More information about the Pkg-samba-maint mailing list