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

[Kurt B. Kaiser]

Author: kbk-guest
Date: Mon Jan 14 02:15:21 2008
New Revision: 127

Log:
Don't ignore make clean error in rules


Modified:
   trunk/debian/changelog
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Mon Jan 14 02:15:21 2008
@@ -2,10 +2,11 @@
 
   [Kurt B. Kaiser]
   * Acknowledge NMU. Thanks Adrian Friedli.  (Closes: #448519)
-  * dspamc should be setgid (Closes: #449530)
-  * daemon crashes sometimes, can't determine user (Closes: #385353)
+  * dspamc should be setgid. (Closes: #449530)
+  * Daemon crashes sometimes, can't determine user. (Closes: #385353)
+  * Don't ignore make clean error in rules.
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sun, 13 Jan 2008 16:07:35 -0500
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sun, 13 Jan 2008 21:13:51 -0500
 
 dspam (3.6.8-5.1) unstable; urgency=medium
 

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Mon Jan 14 02:15:21 2008
@@ -92,7 +92,7 @@
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) clean
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
@@ -106,21 +106,21 @@
 install: build
 	dh_testdir
 	dh_testroot
-	
+
 	dh_clean -k
 	dh_installdirs
 	(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
 	cp debian/libdspam7-drv-mysql.override $(CURDIR)/debian/libdspam7-drv-mysql/usr/share/lintian/overrides/libdspam7-drv-mysql
 	cp debian/libdspam7-drv-pgsql.override $(CURDIR)/debian/libdspam7-drv-pgsql/usr/share/lintian/overrides/libdspam7-drv-pgsql
-	
+
 	# 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
-	
+
 	# Install PostgreSQL data file
 	cp debian/sqlfiles/pgsql-dbadmin $(CURDIR)/debian/libdspam7-drv-pgsql/usr/share/dbconfig-common/data/libdspam7-drv-pgsql/install-dbadmin/pgsql