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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-06-18 21:06:24 +0000 (Fri, 18 Jun 2010)
New Revision: 3524

Modified:
   trunk/samba4/debian/changelog
   trunk/samba4/debian/control
   trunk/samba4/debian/rules
Log:
Build newer snapshot.

Modified: trunk/samba4/debian/changelog
===================================================================
--- trunk/samba4/debian/changelog	2010-06-18 21:06:13 UTC (rev 3523)
+++ trunk/samba4/debian/changelog	2010-06-18 21:06:24 UTC (rev 3524)
@@ -1,7 +1,8 @@
-samba4 (4.0.0~alpha13+git20100615.dfsg1-1) experimental; urgency=low
+samba4 (4.0.0~alpha13+git20100618.dfsg1-1) experimental; urgency=low
 
   [ Jelmer Vernooij ]
   * New upstream snapshot.
+   + Add dependency on python-dnspython.
 
   [ Christian Perrier ]
   * Debconf translations:

Modified: trunk/samba4/debian/control
===================================================================
--- trunk/samba4/debian/control	2010-06-18 21:06:13 UTC (rev 3523)
+++ trunk/samba4/debian/control	2010-06-18 21:06:24 UTC (rev 3524)
@@ -55,6 +55,7 @@
 Depends: ${shlibs:Depends}, samba4-common-bin (=${binary:Version}), ${misc:Depends}
 Conflicts: smbclient, samba-common (<< 2:3.3.0~rc2-5)
 XB-Python-Version: ${python:Versions}
+Provides: smbclient
 Description: client utilities from Samba 4
  The Samba software suite is a collection of programs that
  implements the SMB protocol for unix systems, allowing you to serve

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-06-18 21:06:13 UTC (rev 3523)
+++ trunk/samba4/debian/rules	2010-06-18 21:06:24 UTC (rev 3524)
@@ -65,15 +65,13 @@
 	#$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(DESTDIR)
 	dh_testdir
 	dh_testroot
-	# Remove files created when running install more than once
-	find $(DESTDIR) -name "*.old" | xargs rm -f
 	# Alternatives are used
 	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
 	# Already provided by samba-common
-	rm -f $(DESTDIR)/usr/share/samba/*.dat
+	rm $(DESTDIR)/usr/share/samba/*.dat
 	# Already provided by libparse-yapp-perl
 	rm $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# Binaries not ready for installation