[pkg-dspam-commits] r44 - trunk/debian

[Matthijs Mohlmann]

Author: active2-guest
Date: Sat Nov  5 16:18:28 2005
New Revision: 44

Modified:
   trunk/debian/control
   trunk/debian/rules
Log:
 * Modified the rules file to use -a instead of -A, -a is to only act on
   architecture dependent packages, and -i is to act on architecture
   independent packages. This solves the lintian warning duplicate conffiles.
 * Removed the commented Build-Depends from debian/control


Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control	(original)
+++ trunk/debian/control	Sat Nov  5 16:18:28 2005
@@ -3,7 +3,6 @@
 Priority: optional
 Maintainer: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
 Uploaders: Matthijs Mohlmann <matthijs at cacholong.nl>, Christoph Haas <haas at debian.org>, Kurt B. Kaiser <kbk at shore.net>, Jesus Climent <mooch at debian.org>
-#Build-Depends: debhelper (>= 4.1.16), libpq-dev | postgresql-dev, dpatch (>= 2.0.0), automake1.9, autotools-dev, libmysqlclient15-dev, libdb4.2-dev, libsqlite3-dev, libldap2-dev
 Build-Depends: debhelper (>= 4.1.16), libpq-dev | postgresql-dev, dpatch (>= 2.0.0), automake1.9, autotools-dev, libmysqlclient14-dev, libdb4.2-dev, libsqlite3-dev, libldap2-dev
 Standards-Version: 3.6.2.1
 

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Sat Nov  5 16:18:28 2005
@@ -105,6 +105,7 @@
 install: build
 	dh_testdir
 	dh_testroot
+	
 	dh_clean -k
 	dh_installdirs
 	(cd build--tmp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp)
@@ -117,40 +118,40 @@
 	cp build--tmp/webui/cgi-bin/configure.pl $(CURDIR)/debian/dspam-webfrontend/etc/dspam/webfrontend.conf
 
 binary-indep: build install
-	dh_testdir
-	dh_testroot 
-	dh_installchangelogs CHANGELOG
-	dh_installdocs
+	dh_testdir -i
+	dh_testroot -i
+	dh_installchangelogs -i CHANGELOG
+	dh_installdocs -i
 	# removing svn-related directory from dspam-doc package
-	find debian/dspam-doc -type d -name '.svn' -exec rm -rf {} \; || true
-	dh_compress -A
-	dh_link 
-	dh_fixperms
-	dh_installdeb
+	#find debian/dspam-doc -type d -name '.svn' -exec rm -rf {} \; || true
+	dh_compress -i -A
+	dh_link -i
+	dh_fixperms -i
+	dh_installdeb -i
 	dh_gencontrol -i
-	dh_md5sums 
-	dh_builddeb
+	dh_md5sums -i
+	dh_builddeb -i
 
 # Build architecture dependant packages using the common target.
 binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGELOG
-	dh_install 
+	dh_testdir -a
+	dh_testroot -a
+	dh_installchangelogs -a CHANGELOG
+	dh_install -a
 	dh_installdocs -a
 	dh_installcron -a
 	dh_installlogrotate -a
-	dh_installman -A
-	dh_makeshlibs -A -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-db4 -Nlibdspam7-drv-sqlite3 -Nlibdspam7-drv-hash
-	dh_link -A
-	dh_strip -A
-	dh_compress -A
-	dh_fixperms -A
-	dh_installdeb -A
-	dh_shlibdeps -A
-	dh_gencontrol -A
-	dh_md5sums -A
-	dh_builddeb -A
+	dh_installman -a
+	dh_makeshlibs -a -Nlibdspam7-drv-pgsql -Nlibdspam7-drv-mysql -Nlibdspam7-drv-db4 -Nlibdspam7-drv-sqlite3 -Nlibdspam7-drv-hash
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 patch: patch-stamp
 patch-stamp: