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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-09-26 21:00:44 +0000 (Mon, 26 Sep 2011)
New Revision: 3915

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
Use DH_ALWAYS_EXCLUDE instead of passing override options to
dh_installexamples.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-09-26 20:15:45 UTC (rev 3914)
+++ trunk/samba/debian/changelog	2011-09-26 21:00:44 UTC (rev 3915)
@@ -24,6 +24,8 @@
   * Bump build-depends on debhelper to 8.9.4, so we ensure we have
     dpkg-buildflags by default and get full build hardening enabled out of
     the box - critical for a server like samba.
+  * Use DH_ALWAYS_EXCLUDE instead of passing override options to
+    dh_installexamples.
 
  -- Steve Langasek <vorlon at debian.org>  Sat, 24 Sep 2011 13:36:50 -0700
 

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-09-26 20:15:45 UTC (rev 3914)
+++ trunk/samba/debian/rules	2011-09-26 21:00:44 UTC (rev 3915)
@@ -8,6 +8,9 @@
 DEB_CFLAGS_MAINT_APPEND  := -Wall
 export DEB_CFLAGS_MAINT_APPEND
 
+# Ignore these files which would otherwise be pulled into our examples
+export DH_ALWAYS_EXCLUDE := COPYING:Makefile.internal
+
 DESTDIR=`pwd`/debian/tmp
 
 %:
@@ -104,11 +107,6 @@
 override_dh_installpam:
 	dh_installpam --name=samba
 
-override_dh_installexamples:
-	# Ignore COPYING. Otherwise, an extra copy of the GPL licence 
-	# in smbldap-tools example is included in samba-doc
-	dh_installexamples -Xsmbldap-tools-* -XCOPYING -XMakefile.internal
-
 override_dh_installchangelogs:
 	dh_installchangelogs -Nlibpam-smbpass -Xhistory
 ifneq (,$(filter libpam-smbpass, $(shell dh_listpackages)))