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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-09-26 21:24:56 +0000 (Mon, 26 Sep 2011)
New Revision: 3916

Modified:
   trunk/samba/debian/rules
Log:
move more options into DH_ALWAYS_EXCLUDE instead of -X options

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-09-26 21:00:44 UTC (rev 3915)
+++ trunk/samba/debian/rules	2011-09-26 21:24:56 UTC (rev 3916)
@@ -9,7 +9,7 @@
 export DEB_CFLAGS_MAINT_APPEND
 
 # Ignore these files which would otherwise be pulled into our examples
-export DH_ALWAYS_EXCLUDE := COPYING:Makefile.internal
+export DH_ALWAYS_EXCLUDE := COPYING:Makefile.internal:history
 
 DESTDIR=`pwd`/debian/tmp
 
@@ -108,9 +108,9 @@
 	dh_installpam --name=samba
 
 override_dh_installchangelogs:
-	dh_installchangelogs -Nlibpam-smbpass -Xhistory
+	dh_installchangelogs -Nlibpam-smbpass
 ifneq (,$(filter libpam-smbpass, $(shell dh_listpackages)))
-	dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG -Xhistory
+	dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
 endif
 
 override_dh_installinit: