[SCM] snaphu branch, master, updated. upstream/1.4.2-10-g9af0c2c

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 9af0c2cc81b296a6f9f245245d4bfae4440140cc
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Aug 7 21:44:09 2011 +0200

    Switch to dh8

diff --git a/debian/changelog b/debian/changelog
index 2403909..9e44dd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ snaphu (1.4.2-1) unstable; urgency=low
 
   * Initial release (Closes: #606882)
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 07 Aug 2011 18:48:36 +0200
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 07 Aug 2011 21:43:06 +0200
diff --git a/debian/control b/debian/control
index f62af8d..ad7b257 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: non-free/science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Antonio Valentino <antonio.valentino at tiscali.it>
-Build-Depends: cdbs, debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.2
 Homepage: http://www-star.stanford.edu/sar_group/snaphu
 Vcs-Git: git://git.debian.org/git/pkg-grass/snaphu.git
diff --git a/debian/rules b/debian/rules
index 5fa06be..7abfb00 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,24 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/makefile.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
+DH_OPTIONS=--sourcedirectory=src
 
-DEB_BUILDDIR            = src
-#DEB_MAKE_CLEAN_TARGET   = clobber
-DEB_MAKE_EXTRA_ARGS     = CFLAGS="-O3 -Wall"
-DEB_MAKE_INSTALL_TARGET = install INSTALLDIR=$(CURDIR)/debian/snaphu/usr/bin/ MANDIR=$(CURDIR)/debian/snaphu/usr/share/man
+%:
+	dh $@
 
-
-makebuilddir::
+override_dh_auto_build:
 	mkdir -p bin
+	dh_auto_build --sourcedirectory=src
 
+override_dh_auto_install:
+	dh_auto_install --sourcedirectory=src -- INSTALLDIR=../debian/snaphu/usr/bin/ MANDIR=../debian/snaphu/usr/share/man
 
-clean::
-	$(MAKE) -C $(DEB_BUILDDIR) clobber
+override_dh_auto_clean:
+	dh_auto_clean --sourcedirectory=src
+	$(MAKE) -C src clobber
 	rm -rf bin
+
+.PHONY: override_dh_auto_build override_dh_auto_install override_dh_auto_clean

-- 
Statistical-Cost, Netowrk-Flow Algorithm for Phase Unwrapping