[SCM] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 8fb55289b90df49afdd25c2243444b831fdfc026
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Dec 16 16:37:34 2013 +0100

    Minor update and policy fixes.

diff --git a/debian/changelog b/debian/changelog
index bce70f8..7943bbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ libgeotiff-dfsg (1.4.0-1) unstable; urgency=low
   * Debhelper level set to 9.
   * Updated watch file to reflect current repo.
   * Set canonical Vcs-* fiedls.
+  * Added misc-depends to -dev package.
+  * Now using dh_ methods to update/restore autotools config.* stuff.
+  * Introduced missing recommended build-* targets in debian/rules.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 16 Dec 2013 16:20:15 +0100
 
diff --git a/debian/control b/debian/control
index 61a82e9..d0fd103 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-grass/libgeotiff-dfsg.git
 Package: libgeotiff-dev
 Section: libdevel
 Architecture: any
-Depends: libgeotiff2 (= ${binary:Version}), libtiff4-dev
+Depends: libgeotiff2 (= ${binary:Version}), libtiff4-dev, ${misc:Depends}
 Suggests: libgeotiff-epsg
 Description: the GeoTIFF library -- development files
  This C library supports TIFF 6.0 based interchange format for georeferenced 
diff --git a/debian/rules b/debian/rules
index 1e9dce0..4745e70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,20 +20,16 @@ endif
 
 config.status: configure 
 	dh_testdir
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	mv config.sub config.sub.original
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	mv config.guess config.guess.original
-	cp -f /usr/share/misc/config.guess config.guess
-endif
+	dh_autotools-dev_updateconfig
 	# Add here commands to configure the package.
 	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		    --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 		    --includedir=\$${prefix}/include/geotiff
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
 build-stamp:  config.status
 
 	dh_testdir
@@ -46,13 +42,7 @@ build-stamp:  config.status
 clean: 
 	dh_testdir
 	dh_testroot
-
-ifneq "$(wildcard /usr/share/misc/config.sub.original)" ""
-	mv config.sub.original config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess.original)" ""
-	mv config.guess.original config.guess
-endif
+	dh_autotools-dev_restoreconfig
 	
 	# Add here commands to clean up after the build process.
 	[ ! -f $(CURDIR)/Makefile ] || $(MAKE) distclean
@@ -73,11 +63,11 @@ install: build
 
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build-indep install
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog

-- 
The GeoTIFF library