[Pkg-samba-maint] r3703 - in trunk/samba: . debian

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2011-03-12 17:10:41 +0000 (Sat, 12 Mar 2011)
New Revision: 3703

Modified:
   trunk/samba/
   trunk/samba/debian/changelog
   trunk/samba/debian/control
   trunk/samba/debian/rules
   trunk/samba/debian/samba-tools.files
   trunk/samba/debian/samba.files
Log:
Build against external libtdb.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-03-12 17:10:29 UTC (rev 3702)
+++ trunk/samba/debian/changelog	2011-03-12 17:10:41 UTC (rev 3703)
@@ -1,8 +1,9 @@
 samba (2:3.5.8~dfsg-2) UNRELEASED; urgency=low
 
   * Add libwbclient-dev package.
+  * Build against external libtdb.
 
- -- Jelmer Vernooij <jelmer at debian.org>  Sat, 12 Mar 2011 04:42:26 +0100
+ -- Jelmer Vernooij <jelmer at debian.org>  Sat, 12 Mar 2011 17:47:49 +0100
 
 samba (2:3.5.8~dfsg-1) unstable; urgency=low
 

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2011-03-12 17:10:29 UTC (rev 3702)
+++ trunk/samba/debian/control	2011-03-12 17:10:41 UTC (rev 3703)
@@ -8,6 +8,7 @@
 	libacl1-dev [linux-any],
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
 	libtalloc-dev (>= 2.0.1-1~bpo50+1),
+	libtdb-dev (>= 1.2.1~),
 	libcap-dev [linux-any],
 	libkeyutils-dev [linux-any],
 	ctdb (>= 1.0.103) [linux-any],
@@ -21,7 +22,7 @@
 Package: samba
 Architecture: any
 Depends: samba-common (= ${source:Version}), libwbclient0 (= ${binary:Version}),${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-11), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
-Recommends: logrotate
+Recommends: logrotate, tdb-tools
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools, ctdb
 Replaces: samba-common (<= 2.0.5a-2)
 Conflicts: samba4 (<< 4.0.0~alpha6-2)

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-03-12 17:10:29 UTC (rev 3702)
+++ trunk/samba/debian/rules	2011-03-12 17:10:41 UTC (rev 3703)
@@ -60,7 +60,9 @@
 		--with-codepagedir=/usr/share/samba \
 		--enable-external-libtalloc \
 		--without-libtalloc \
-		--disable-avahi
+		--disable-avahi \
+		--without-libtdb \
+		--enable-external-libtdb
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   conf_args += \
@@ -161,7 +163,6 @@
 	install -m 0755 source3/bin/vfstest $(DESTDIR)/usr/bin/vfstest
 	install -m 0755 source3/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
 	install -m 0755 source3/bin/replacetort $(DESTDIR)/usr/bin/replacetort
-	install -m 0755 source3/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
 	install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
 	mkdir -p $(DESTDIR)/usr/share/pam-configs
 	install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate

Modified: trunk/samba/debian/samba-tools.files
===================================================================
--- trunk/samba/debian/samba-tools.files	2011-03-12 17:10:29 UTC (rev 3702)
+++ trunk/samba/debian/samba-tools.files	2011-03-12 17:10:41 UTC (rev 3703)
@@ -7,6 +7,5 @@
 usr/bin/vfstest
 usr/bin/pdbtest
 usr/bin/replacetort
-usr/bin/tdbtorture
 usr/bin/smbconftort
 

Modified: trunk/samba/debian/samba.files
===================================================================
--- trunk/samba/debian/samba.files	2011-03-12 17:10:29 UTC (rev 3702)
+++ trunk/samba/debian/samba.files	2011-03-12 17:10:41 UTC (rev 3703)
@@ -2,7 +2,6 @@
 usr/bin/smbstatus.samba3
 usr/bin/smbcontrol
 usr/bin/profiles
-usr/bin/tdbbackup
 usr/bin/pdbedit
 usr/sbin/smbd
 usr/sbin/nmbd
@@ -15,6 +14,5 @@
 usr/share/man/man8/pdbedit.8
 usr/share/man/man8/smbd.8
 usr/share/man/man8/mksmbpasswd.8
-usr/share/man/man8/tdbbackup.8
 usr/share/man/man8/eventlogadm.8
 etc/network/if-up.d/samba