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

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2010-06-18 21:05:59 +0000 (Fri, 18 Jun 2010)
New Revision: 3519

Modified:
   trunk/samba4/debian/rules
Log:
Remove some unnecessary cleanups.

Modified: trunk/samba4/debian/rules
===================================================================
--- trunk/samba4/debian/rules	2010-06-18 21:05:57 UTC (rev 3518)
+++ trunk/samba4/debian/rules	2010-06-18 21:05:59 UTC (rev 3519)
@@ -26,8 +26,7 @@
 		--with-piddir=/var/run \
 		--disable-rpath \
 		--disable-rpath-install \
-		--bundled-libraries=NONE \
-		#--enable-dso 
+		--bundled-libraries=NONE
 	touch $@
 
 build: build-stamp
@@ -73,42 +72,37 @@
 	mv $(DESTDIR)/usr/bin/net $(DESTDIR)/usr/bin/net.samba4
 	mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba4
 	# Provided by samba-common
-	rm -f $(DESTDIR)/usr/share/samba/*.dat
+	rm $(DESTDIR)/usr/share/samba/*.dat
 	# Already provided by libparse-yapp-perl
-	rm -f $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
+	rm $(DESTDIR)/usr/share/perl5/Parse/Yapp/Driver.pm
 	# Binaries not ready for installation
-	rm -f $(DESTDIR)/usr/lib/mit_samba.so
-	rm -f $(DESTDIR)/usr/bin/subunitrun
-	rm -f $(DESTDIR)/usr/bin/winreg
-	rm -f $(DESTDIR)/usr/bin/samba3dump
-	rm -f $(DESTDIR)/usr/bin/winreg.py
-	rm -f $(DESTDIR)/usr/bin/minschema
-	rm -f $(DESTDIR)/usr/bin/rpcclient
+	rm $(DESTDIR)/usr/lib/mit_samba.so
+	rm $(DESTDIR)/usr/bin/subunitrun
+	rm $(DESTDIR)/usr/bin/winreg
+	rm $(DESTDIR)/usr/bin/samba3dump
+	rm $(DESTDIR)/usr/bin/winreg.py
+	rm $(DESTDIR)/usr/bin/minschema
+	rm $(DESTDIR)/usr/bin/rpcclient
 	# No need to do development using nss_winbind
-	rm -f $(DESTDIR)/usr/lib/libnss_winbind.so
-	rm -f $(DESTDIR)/usr/lib/pkgconfig/nss_winbind.pc
-	rm -f $(DESTDIR)/usr/share/man/man3/talloc.3
+	rm $(DESTDIR)/usr/lib/libnss_winbind.so
+	rm $(DESTDIR)/usr/lib/pkgconfig/nss_winbind.pc
+	rm $(DESTDIR)/usr/share/man/man3/talloc.3
 	# Already included in python-tdb
-	rm -f $(DESTDIR)/usr/lib/python*/*-packages/tdb.so
+	rm $(DESTDIR)/usr/lib/python*/*-packages/tdb.so
 	# Already included in the version of Python we depend on
-	rm -f $(DESTDIR)/usr/lib/python*/*-packages/uuid.so
-	# 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
+	rm $(DESTDIR)/usr/lib/python*/*-packages/uuid.so
+	# Already included in various system packages
+	rm -r $(DESTDIR)/usr/lib/python*/*-packages/samba/external
 	# Already included in tdb-tools
-	rm -f $(DESTDIR)/usr/bin/tdb*
+	rm $(DESTDIR)/usr/bin/tdb*
 	# Already included in smbfs
-	rm -f $(DESTDIR)/usr/bin/mount.cifs
-	rm -f $(DESTDIR)/usr/bin/umount.cifs
+	rm $(DESTDIR)/usr/bin/mount.cifs
+	rm $(DESTDIR)/usr/bin/umount.cifs
 	# Not mature enough
-	rm -f $(DESTDIR)/usr/bin/autoidl
-	rm -f $(DESTDIR)/usr/bin/mymachinepw
+	rm $(DESTDIR)/usr/bin/autoidl
+	rm $(DESTDIR)/usr/bin/mymachinepw
 	# Already documented in debian/copyright
-	rm -f $(DESTDIR)/usr/share/samba/setup/ad-schema/licence.txt
+	rm $(DESTDIR)/usr/share/samba/setup/ad-schema/licence.txt
 	# System ldb loads its modules from a different path
 	mv $(DESTDIR)/usr/lib/samba/ldb $(DESTDIR)/usr/lib/ldb
 	ln -sf ../ldb $(DESTDIR)/usr/lib/samba/ldb