[DebianGIS-dev] [SCM] tilecache branch, master, updated. debian/2.03-1.4-21-g4a95b68

[David Paleino]

The following commit has been merged in the master branch:
commit 47b358f975f673e37e36f49ddcf14d7394e62360
Author: David Paleino <dapal at debian.org>
Date:   Sat Nov 6 10:53:26 2010 +0100

    debian/rules rewritten to use dh7

diff --git a/debian/changelog b/debian/changelog
index 9f285ca..d3ebc0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ tilecache (2.11-1) UNRELEASED; urgency=low
   * debian/copyright updated to DEP-5, added missing info
   * debian/docs, debian/examples updated
   * debian/clean added
+  * debian/rules rewritten to use dh7
 
- -- David Paleino <dapal at debian.org>  Sat, 06 Nov 2010 10:52:18 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 06 Nov 2010 10:53:15 +0100
 
 tilecache (2.03-1.4) unstable; urgency=high
 
diff --git a/debian/rules b/debian/rules
index fed89be..ff6763e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,43 +1,23 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# TileCache debian/rules
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/python/python.mk
-
 PREFIX := debian/tilecache
-PYSUPPORT := /usr/share/python-support/tilecache
 
-build: build-stamp
+%:
+	dh $@
 
-build-stamp:
-	dh_testdir
-	# Add here commands to compile the package.
+override_dh_auto_build:
 	sed -e 's!tilecache\.cgi!/cgi-bin/tilecache.cgi!' ./index.html > ./cgi-example.html
-	python ./setup.py test 
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build dist TileCache.egg-info
-	rm -f build-stamp configure-stamp cgi-example.html
-
-	dh_clean *.pyc TileCache/*.pyc TileCache/Caches/*.pyc \
-		TileCache/Services/*.pyc TileCache/Layers/*.pyc tests/*.pyc
+	dh_auto_build
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+override_dh_auto_test:
+	python setup.py test
 
-	# Add here commands to install the package into debian/tilecache.
-	python ./setup.py install --debian --no-compile --root=$(PREFIX) $(py_setup_install_args)
-    
-	# eliminates script-not-executable warning from lintian
+override_dh_auto_install:
+	dh_auto_install
 
 	rm $(PREFIX)/usr/bin/tilecache_install_config.py # only used for eggs
 	mv $(PREFIX)/usr/bin/tilecache.* $(PREFIX)/usr/lib/cgi-bin # .cgi, .fcgi
@@ -46,26 +26,9 @@ install: build
 	mv $(PREFIX)/usr/bin/tilecache_http_server.py $(PREFIX)/usr/sbin/tilecache_http_server
 	rmdir $(PREFIX)/usr/bin
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs docs/NEWS.txt
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_compress
-	dh_fixperms
 	chmod +x $(PREFIX)/usr/lib/python*/*-packages/TileCache/Service.py
 	chmod +x $(PREFIX)/usr/lib/python*/*-packages/TileCache/Client.py
 	rm $(PREFIX)/usr/lib/python*/*-packages/TileCache/Caches/S3.py # Suggests python-boto instead.
-	dh_pysupport
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep
-binary-arch:
-.PHONY: build clean binary-indep binary install
+override_dh_installchangelogs:
+	dh_installchangelogs docs/NEWS.txt

-- 
a web map tile caching system