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

[jelmer at alioth.debian.org]

tags 547280 pending
thanks

Author: jelmer
Date: 2010-02-08 02:50:22 +0000 (Mon, 08 Feb 2010)
New Revision: 3281

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/rules
   trunk/samba4/debian/samba4-clients.install
Log:
Fix the build.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2010-02-08 02:50:17 UTC (rev 3280)
+++ trunk/samba4/debian/changelog	2010-02-08 02:50:22 UTC (rev 3281)
@@ -1,4 +1,4 @@
-samba4 (4.0.0~alpha8+git20100101.dfsg1-1) UNRELEASED; urgency=low
+samba4 (4.0.0~alpha8+git20100203.dfsg1-1) experimental; urgency=low
 
   [ Christian Perrier ]
   * Change "Provides:" in init script to avoid conflicting Provides
@@ -7,7 +7,8 @@
   [ Jelmer Vernooij ]
   * Depend on specific version of libldb. Closes: #562389
   * Build against system Heimdal and remove the copy of Heimdal from the 
-    Samba 4 source tree, since it contains non-free IETF RFC/I-D. Closes: #547280
+    Samba 4 source tree, since it contains non-free IETF RFC/I-D.
+    Closes: #547280
   * Bump standards version to 3.8.4.
   * Switch to dpkg-source 3.0 (quilt) format
 

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2010-02-08 02:50:17 UTC (rev 3280)
+++ trunk/samba4/debian/control	2010-02-08 02:50:22 UTC (rev 3281)
@@ -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.4
-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, libtdb-dev (>= 1.1.5~), libtalloc-dev (>= 2.0.0~), libtevent-dev (>= 0.9.8~), perl-modules, python-dev, python-central (>= 0.5.6), libpopt-dev, pkg-config, samba-common (>= 2:3.4.0~pre2), libldb-dev (>= 1:0.9.6~git20090912), python-ldb, python-tdb, zlib1g-dev (>= 1:1.2.3), heimdal-multidev (>= 1.3)
+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, libtdb-dev (>= 1.1.5~), libtalloc-dev (>= 2.0.0~), libtevent-dev (>= 0.9.8~), perl-modules, python-dev, python-central (>= 0.5.6), libpopt-dev, pkg-config, samba-common (>= 2:3.4.0~pre2), libldb-dev (>= 1:0.9.6~git20090912), python-ldb, python-tdb, zlib1g-dev (>= 1:1.2.3), heimdal-multidev (>= 1.4~)
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba4/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba4
 XS-Python-Version: current

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-02-08 02:50:17 UTC (rev 3280)
+++ trunk/samba4/debian/rules	2010-02-08 02:50:22 UTC (rev 3281)
@@ -96,6 +96,10 @@
 	# Already included in the python-subunit package
 	rm -rf $(DESTDIR)/usr/lib/python*/*-packages/subunit*
 	rm -rf $(DESTDIR)/usr/lib/python*/lib/subunit
+	rm -rf $(DESTDIR)/usr/lib/python*/*-packages/testtools
+	rm -rf $(DESTDIR)/usr/lib/python*/lib/testtools
+	rm -rf $(DESTDIR)/usr/lib/python*/*-packages/iso8601
+	rm -rf $(DESTDIR)/usr/lib/python*/lib/iso8601
 	# Already included in tdb-tools
 	rm -f $(DESTDIR)/usr/bin/tdb*
 	# Already included in smbfs

Modified: trunk/samba4/debian/samba4-clients.install
===================================================================
--- trunk/samba4/debian/samba4-clients.install	2010-02-08 02:50:17 UTC (rev 3280)
+++ trunk/samba4/debian/samba4-clients.install	2010-02-08 02:50:22 UTC (rev 3281)
@@ -1,8 +1,6 @@
-usr/bin/getntacl
 usr/bin/cifsdd
 usr/bin/net.samba4
 usr/bin/nmblookup.samba4
 usr/bin/setnttoken
 usr/bin/smbclient
-usr/share/man/man1/getntacl.1
 usr/share/man/man1/nmblookup.samba4.1