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

[Kurt B. Kaiser]

Author: kbk-guest
Date: Mon Jul 14 05:20:43 2008
New Revision: 159

Log:
1. Build in the main tree because it's easier to distclean.  We are having
   problems with cruft left behind after the build: a second build leaves
   junk in the diff.gz.
2. Use maintainer-clean and then remove the remaining Makefile.in that the
   target doesn't catch.

M    debian/libdspam7-dev.install
M    debian/changelog
M    debian/rules


Modified:
   trunk/debian/changelog
   trunk/debian/libdspam7-dev.install
   trunk/debian/rules

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Mon Jul 14 05:20:43 2008
@@ -7,8 +7,12 @@
   * 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.
+  * Revise build to not use build--tmp subdir: it's easier to clean the tree
+    if the Makefiles are created.
+  * Move linking in config.guess and config.sub to configure target
+  * Use maintainer-clean in clean target and remove any Makefile.in left over.
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sun, 13 Jul 2008 15:30:22 -0400
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Sun, 13 Jul 2008 23:40:19 -0400
 
 dspam (3.6.8-8) unstable; urgency=high
 

Modified: trunk/debian/libdspam7-dev.install
==============================================================================
--- trunk/debian/libdspam7-dev.install	(original)
+++ trunk/debian/libdspam7-dev.install	Mon Jul 14 05:20:43 2008
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/dspam/* usr/include/dspam
-build--tmp/src/auto-config.h usr/include/dspam
+src/auto-config.h usr/include/dspam
 src/pref.h usr/include/dspam
 debian/tmp/usr/lib/pkgconfig/dspam.pc usr/lib/pkgconfig
 debian/tmp/usr/lib/libdspam.so usr/lib

Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules	(original)
+++ trunk/debian/rules	Mon Jul 14 05:20:43 2008
@@ -30,7 +30,7 @@
 		  --with-logdir=/var/log/dspam/ \
 		  --localstatedir=/var \
 		  --libexecdir=/usr/lib/dspam \
-		  --srcdir=.. \
+		  --srcdir=. \
 		  --with-dspam-home=/var/spool/dspam \
 		  --sysconfdir=/etc/dspam \
 		  --enable-domain-scale \
@@ -64,15 +64,15 @@
 configure-stamp:
 	dh_testdir
 	# Add here commands to configure the package.
-	mkdir build--tmp
+	ln -sf /usr/share/misc/config.sub config.sub
+	ln -sf /usr/share/misc/config.guess config.guess
 	./autogen.sh
-	(cd build--tmp && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ../configure $(CONFIGURE))
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure $(CONFIGURE)
 	touch configure-stamp
 
-# Build target.
 build: patch build-stamp
 build-stamp: configure
-	(cd build--tmp && $(MAKE))
+	$(MAKE)
 	chmod 644 webui/cgi-bin/templates/*
 	chmod 644 webui/cgi-bin/admins
 	chmod 644 webui/cgi-bin/default.prefs
@@ -86,37 +86,28 @@
 clean-patched:
 	dh_testdir
 	dh_testroot
-	# remove the Alioth website brought in by svn:
+	# remove any Alioth website brought in by svn:
 	rm -rf htdocs
+	#
 	rm -rf debian/dspam-webfrontend
-	rm -rf build--tmp
 	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) clean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
+	[ ! -f Makefile ] || $(MAKE) maintainer-clean
+	# maintainer-clean doesn't catch all the Makefile.in:
+	find -type f \( -name Makefile.in \) -print0 | xargs -0 rm -f
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
-
 	dh_clean -k
 	dh_installdirs
-	(cd build--tmp && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp)
-	dh_install --list-missing
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	# 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 -d -g root -m 755 -o root \
+	        $(CURDIR)/debian/dspam-webfrontend/etc/dspam
+	cp 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
 
@@ -124,6 +115,7 @@
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs -i CHANGELOG
+	dh_install -i
 	dh_installdocs -i
 	dh_lintian -i
 	# removing svn-related directory from dspam-doc package
@@ -171,4 +163,5 @@
 	rm -rf patch-stamp debian/patched
 
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure \
+        patch unpatch