[DebianGIS-dev] [SCM] openstreetmap-map-icons branch, master, updated. debian/1_0.0.svn18468-1-13-g1a62b15

[David Paleino]

The following commit has been merged in the master branch:
commit 1a62b157294a4936dd498a26695a5497087d2230
Author: David Paleino <dapal at debian.org>
Date:   Thu Jun 17 09:47:48 2010 +0200

    debian/rules rewritten using dh7

diff --git a/debian/changelog b/debian/changelog
index 75ef37d..81991f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ openstreetmap-map-icons (1:0.0.svn20783-2) UNRELEASED; urgency=low
 
   * debian/compat bumped to 7
   * debian/control: build-dependency on debhelper bumped to >= 7.0.50~
+  * debian/rules rewritten using dh7
 
- -- David Paleino <dapal at debian.org>  Thu, 17 Jun 2010 09:45:20 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 17 Jun 2010 09:47:40 +0200
 
 openstreetmap-map-icons (1:0.0.svn20783-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index e028f2d..e755214 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,59 +14,20 @@ VERSION := 0.0.svn${SVNREV}
 DESTDIR := ../tarballs/openstreetmap-map-icons-${VERSION}
 DESTTGZ := ../tarballs/openstreetmap-map-icons_${VERSION}.orig.tar.gz
 
-build: build-arch build-indep
+%:
+	dh $@
 
-build-arch: build-arch-stamp
-build-arch-stamp: 
-	touch $@
-
-build-indep: build-indep-stamp
-build-indep-stamp: 
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp
-	dh_clean
-
-install: install-indep install-arch
-install-indep:
-	dh_testdir
-	dh_testroot
-	dh_clean -k -i
-	dh_installdirs -i
-	dh_install -i
+override_dh_install:
+	dh_install
 	for i in classic scalable square ; do \
 		find $(CURDIR)/debian/openstreetmap-map-icons-$$i/usr/share/icons/openstreetmap/ -type d -empty -delete ; \
 		find $(CURDIR)/debian/openstreetmap-map-icons-$$i/usr/share/icons/openstreetmap/ -type f | xargs chmod 644 ; \
 	done
 
-install-arch:
-
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
+override_dh_link:
 	for i in classic.small classic.big square.small square.big scalable ; do \
 		dh_link usr/share/icons/openstreetmap/$$i usr/share/doc/openstreetmap-map-icons-classic/examples/$$i ; \
 	done
-	dh_compress
-	dh_fixperms 
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-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: binary-arch binary-indep
 
 get-orig-source:
 	dh_testdir
@@ -74,7 +35,7 @@ get-orig-source:
 	@echo Downloading openstreetmap-map-icons from $(SVNREPO)
 	svn -r $(SVNREV) export $(SVNREPO) $(DESTDIR)
 	@echo Removing directories: debian nickw japan
-	rm -rf $(DESTDIR)/debian
+	rm -rf $(DESTDIR)/debian    # not really needed with dh7
 	rm -rf $(DESTDIR)/nickw
 	rm -rf $(DESTDIR)/japan
 	@echo Building snapshot tarball
@@ -85,5 +46,3 @@ get-orig-source:
 	@echo To update debian/changelog type
 	@echo dch -v $(VERSION)-1
 	@echo .
-
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch

-- 
OpenStreetMap icon artworks