[Pkg-samba-maint] r1416 - trunk/samba/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-05-27 07:26:05 +0000 (Sun, 27 May 2007)
New Revision: 1416

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
Avoid installing extra GPL license files in the documentation directory


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-05-27 06:44:08 UTC (rev 1415)
+++ trunk/samba/debian/changelog	2007-05-27 07:26:05 UTC (rev 1416)
@@ -15,6 +15,8 @@
     - debian/control: wrap long lines in packages' descriptions
     - uncomment out use of type-handling in the clean target, because
       type-handling has been fixed to support the new /usr/share/dpkg/ostable
+    - avoid installing extra COPYING files in /usr/share/doc/* (one was 
+      installed along with the pcap2nbench example)
   * Merge Ubuntu changes:
     - use of PIDDIR instead of hardcoding it in samba.init and winbind.init
   * Patches to upstream source:

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2007-05-27 06:44:08 UTC (rev 1415)
+++ trunk/samba/debian/rules	2007-05-27 07:26:05 UTC (rev 1416)
@@ -177,7 +177,7 @@
 	dh_installdocs -A debian/README.build
 	# Ignore COPYING. Otherwise, an extra copy of the GPL licence 
 	# in smbldap-tools example is included in samba-doc
-	dh_installexamples -Xsmbldap-tools-*
+	dh_installexamples -Xsmbldap-tools-* -XCOPYING
 	dh_installchangelogs
 	dh_link
 	dh_compress