[SCM] shapelib branch, master, updated. upstream/1.2.10-11-g89f5fae

[Arto Jantunen]

The following commit has been merged in the master branch:
commit 8556d7e9b0405c011a69d90cd55c7b016f0f7c51
Author: Arto Jantunen <arto.jantunen at logica.com>
Date:   Mon Apr 30 14:27:23 2012 +0300

    Update to the dh tool (and debhelper compat 9)

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 691ec0e..88e080e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: shapelib
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.8.3
 Homepage: http://shapelib.maptools.org/
 
diff --git a/debian/rules b/debian/rules
index 874e879..303bca5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,81 +1,29 @@
 #!/usr/bin/make -f
+%:
+	dh $@
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+override_dh_auto_test:
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-	# Add here commands to compile the package.
-	$(MAKE)
+override_dh_auto_build:
+	mv shprewind shprewind.bak
+	dh_auto_build
 	$(MAKE) lib
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	# Add here commands to clean up after the build process.
-	$(MAKE) clean
-	rm -f shprewind
-	dh_clean
+override_dh_auto_clean:
+	dh_auto_clean
+	mv shprewind.bak shprewind || true
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	# have to copy the files by hand.:(
-	mkdir debian/tmp/
-	mkdir debian/tmp/usr/
-	mkdir debian/tmp/usr/bin/
-	cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind shptest \
-		debian/tmp/usr/bin/.
-	
+override_dh_auto_install:
+        # have to copy the files by hand.:(
+	mkdir -p debian/tmp/usr/bin/
 	mkdir debian/tmp/usr/lib/
+	mkdir debian/tmp/usr/include/
+	cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind \
+	shptest debian/tmp/usr/bin/
 	cp .libs/libshp.a debian/tmp/usr/lib/
 	cp libshp.la debian/tmp/usr/lib/
 	cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/
 	ln -s libshp.so.1.0.1 libshp.so
 	ln -s libshp.so.1.0.1 libshp.so.1
 	mv libshp.so* debian/tmp/usr/lib/
-	
-	mkdir debian/tmp/usr/include/
 	cp shapefil.h debian/tmp/usr/include/
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install --sourcedir=debian/tmp
-	dh_installdocs *.html
-	dh_installman
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/shapelib.docs b/debian/shapelib.docs
new file mode 100644
index 0000000..12e1ac6
--- /dev/null
+++ b/debian/shapelib.docs
@@ -0,0 +1,3 @@
+dbf_api.html
+shapelib.html
+shp_api.html

-- 
Library for reading and writing ArcView Shapefiles