[DebianGIS-dev] r2440 - packages/postgis/trunk/debian

[frankie at alioth.debian.org]

Author: frankie
Date: 2009-09-14 10:01:27 +0000 (Mon, 14 Sep 2009)
New Revision: 2440

Modified:
   packages/postgis/trunk/debian/changelog
   packages/postgis/trunk/debian/rules
Log:
Minor changes to debian/rules


Modified: packages/postgis/trunk/debian/changelog
===================================================================
--- packages/postgis/trunk/debian/changelog	2009-09-14 09:51:29 UTC (rev 2439)
+++ packages/postgis/trunk/debian/changelog	2009-09-14 10:01:27 UTC (rev 2440)
@@ -1,4 +1,4 @@
-postgis (1.4.0-1) unstable; urgency=low
+postgis (1.4.0-1) experimental; urgency=low
 
   * New upstream release. 
   * Updated configure arguments now obsolete/changed.
@@ -11,15 +11,16 @@
   * Now postgresql >= 8.3, geos >= 3 and proj >= 4.5 are required. This is
     reflected in debian/control for safety.
   * Added PostgreSQL 8.4 support, the 8.3 version will be dropped when 
-    required. Now template for postrm is adapted for multiversioning.
+    required. Now the .in template for postrm changed for multiversioning.
   * Now build-dep on default-jdk which is DFSG-safe.
-    (closes: #529503)
   * Removed Fabio Tranchitella among Uploaders because retired from DebianGis.
   * Now build-dep on imagemagick because doc generation requires convert tool.
   * Added patch install.dpatch to manage minor inconsistencies in the java
     inatallation scripts. 
+  * stamp files are now auto-cleaned.
+  * Cleaned debian/rules to be idempotent.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Sep 2009 07:27:06 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 14 Sep 2009 11:58:45 +0200
 
 postgis (1.3.5-1) unstable; urgency=low
 

Modified: packages/postgis/trunk/debian/rules
===================================================================
--- packages/postgis/trunk/debian/rules	2009-09-14 09:51:29 UTC (rev 2439)
+++ packages/postgis/trunk/debian/rules	2009-09-14 10:01:27 UTC (rev 2440)
@@ -38,21 +38,20 @@
 	CFLAGS += -O2
 endif
 
-build: patch build-arch build-indep
+build: build-arch build-indep
 
-build-arch: build-arch-stamp
+build-arch: patch-stamp build-arch-stamp
 build-arch-stamp:
-	touch build-arch-stamp
+	touch $@
 
-build-indep: build-indep-stamp
+build-indep: patch-stamp build-indep-stamp
 build-indep-stamp:
-	touch build-indep-stamp
+	touch $@
 
 clean: clean-patched unpatch
 clean-patched:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp
 	[ -f doc/html/postgis.html.prev ] && mv doc/html/postgis.html.prev doc/html/postgis.html || true
 	[ ! -f GNUmakefile ] || $(MAKE) distclean || true
 	[ ! -f java/jdbc/Makefile ] || $(MAKE) -C java/jdbc clean
@@ -60,7 +59,7 @@
 	dh_clean 
 
 install: install-indep install-arch
-install-indep:
+install-indep: build-indep
 	dh_testdir
 	dh_testroot
 	dh_prep -i 
@@ -77,7 +76,7 @@
 	$(MAKE) SHELL=/bin/bash distclean
 	dh_install -i
 
-install-arch:
+install-arch: build-arch
 	dh_testdir
 	dh_testroot
 	dh_prep -s 
@@ -149,6 +148,7 @@
 	    $(CURDIR)/debian/postgis-generic.postrm.in >$(CURDIR)/debian/postgis.postrm
 	
 	dh_install -s
+	
 	# copy utils
 	mkdir -p $(CURDIR)/debian/postgresql-8.3-postgis/usr/share/postgresql-8.3-postgis/utils
 	cp utils/*.pl utils/README $(CURDIR)/debian/postgresql-8.3-postgis/usr/share/postgresql-8.3-postgis/utils
@@ -176,11 +176,11 @@
 	dh_builddeb
 
 # Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
+binary-indep: install-indep
 	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
 
 # Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
+binary-arch: install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 binary: binary-arch binary-indep