[Pkg-samba-maint] r784 - trunk

[Christian Perrier]

Author: bubulle
Date: 2005-12-04 09:25:10 +0000 (Sun, 04 Dec 2005)
New Revision: 784

Modified:
   trunk/changelog
   trunk/rules
Log:
Remove the extraneous COPYING file provided in samba-doc


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2005-12-04 09:20:00 UTC (rev 783)
+++ trunk/changelog	2005-12-04 09:25:10 UTC (rev 784)
@@ -30,6 +30,7 @@
   * Corrected FSF address in debian/copyright
   * Make swat depend on netbase as it uses update-inetd in its postinst script
   * Correct shebang lines in config scripts
+  * Remove an extra copy of the GPL in smbldap-tool examples in samba-doc
 
  -- Christian Perrier <bubulle at debian.org>  Sat,  3 Dec 2005 07:30:40 +0100
 

Modified: trunk/rules
===================================================================
--- trunk/rules	2005-12-04 09:20:00 UTC (rev 783)
+++ trunk/rules	2005-12-04 09:25:10 UTC (rev 784)
@@ -221,8 +221,6 @@
 	ln -s ../../doc/samba-doc/htmldocs/using_samba \
 	      $(DESTDIR)/usr/share/samba/swat/using_samba
 
-	# Delete unwanted stuff leftover from "make install"
-
 	# The smbwrapper package is not being generated anymore, so we must
 	#	delete the related man pages.
 	rm $(DESTDIR)/usr/share/man/man1/smbsh.1
@@ -259,6 +257,11 @@
 	dh_installdebconf
 	dh_installdocs -A debian/README.build
 	dh_installexamples
+
+	# Remove an extra copy of the GPL licence in smbldap-tools example
+	# directory. Thanks lintian, for noticing
+	rm debian/samba-doc/usr/share/doc/samba-doc/examples/LDAP/smbldap-tools-0.9.1/COPYING.gz
+
 #	dh_installmenu
 #	dh_installemacsen
 #	dh_installpam