[Pkg-dspam-commits] [pkg-dspam-commits] r158 - trunk/debian

[Kurt B. Kaiser]

Author: kbk-guest
Date: Sun Jul 13 20:24:56 2008
New Revision: 158

Log:
Use dh_lintian to install overrides

D    debian/dspam-webfrontend.override
M    debian/dspam-webfrontend.dirs
M    debian/changelog
M    debian/rules
AM + debian/dspam-webfrontend.lintian-overrides


Added:
   trunk/debian/dspam-webfrontend.lintian-overrides   (props changed)
      - copied unchanged from r154, /trunk/debian/dspam-webfrontend.override
Removed:
   trunk/debian/dspam-webfrontend.override
Modified:
   trunk/debian/changelog
   trunk/debian/dspam-webfrontend.dirs
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Sun Jul 13 20:24:56 2008
@@ -6,6 +6,7 @@
   * Set debhelper combatibility level to 7.
   * Eliminate libdspam7-drv-db4 package, db4 support not included since 3.6.6.
   * Remove the htdocs dir (Alioth website!) brought in from svn repo.
+  * Use dh_lintian to install the webfrontend conffile override.
 
  -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sun, 13 Jul 2008 15:30:22 -0400
 

Modified: trunk/debian/dspam-webfrontend.dirs
==============================================================================
--- trunk/debian/dspam-webfrontend.dirs	(original)
+++ trunk/debian/dspam-webfrontend.dirs	Sun Jul 13 20:24:56 2008
@@ -1,4 +1,3 @@
 etc/dspam/
 var/spool/dspam/
 var/www/dspam/
-usr/share/lintian/overrides/

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sun Jul 13 20:24:56 2008
@@ -113,9 +113,6 @@
 	(cd build--tmp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp)
 	dh_install --list-missing
 
-	# Install override for conffiles into /usr/share
-	cp debian/dspam-webfrontend.override $(CURDIR)/debian/dspam-webfrontend/usr/share/lintian/overrides/dspam-webfrontend
-
 	# Install configure.pl as /etc/dspam/webfrontend.conf
 	install -d -g root -m 755 -o root $(CURDIR)/debian/dspam-webfrontend/etc/dspam
 	cp build--tmp/webui/cgi-bin/configure.pl $(CURDIR)/debian/dspam-webfrontend/etc/dspam/webfrontend.conf
@@ -128,6 +125,7 @@
 	dh_testroot -i
 	dh_installchangelogs -i CHANGELOG
 	dh_installdocs -i
+	dh_lintian -i
 	# removing svn-related directory from dspam-doc package
 	#find debian/dspam-doc -type d -name '.svn' -exec rm -rf {} \; || true
 	dh_compress -i -A
@@ -138,13 +136,14 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-# Build architecture dependant packages using the common target.
+# Build architecture dependent packages using the common target.
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_installchangelogs -a CHANGELOG
 	dh_install -a
 	dh_installdocs -a
+	dh_lintian -a
 	dh_installcron -a
 	dh_installlogrotate -a
 	dh_installman -a