[SCM] tinyows branch, master, updated. debian/0.9.0-2-40-g0ce88fb

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 0ef92097047861d3f8b4bc7dfcc9b23ac56f0f3e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 21 17:17:30 2013 +0200

    Use minimal dh rules with autoreconf.

diff --git a/debian/changelog b/debian/changelog
index af89351..1d6ee2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ tinyows (1.1.0-3) UNRELEASED; urgency=low
   * Require at least libxml2 v2.8.0 for GML 3.1.1 XSD Schema fix, see:
     http://www.mapserver.org/tinyows/libxmlschemagmlbug.html
   * Drop unused and unneeded build dependencies.
+  * Use minimal dh rules with autoreconf.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 21 Jul 2013 15:37:59 +0200
 
diff --git a/debian/control b/debian/control
index 798e715..9df8145 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: extra
 Maintainer: Pirmin Kalberer <pi_deb at sourcepole.ch>
 Uploaders: Intevation GmbH <christopher.bertels at intevation.de>, Bas Couwenberg <sebastic at xs4all.nl>
-Build-Depends: debhelper (>= 9), autoconf, libpq-dev, libxml2-dev (>= 2.8.0), libxml2 (>= 2.8.0), libfcgi-dev, postgis, flex
+Build-Depends: debhelper (>= 9), autoconf, libpq-dev, libxml2-dev (>= 2.8.0), libxml2 (>= 2.8.0), libfcgi-dev, postgis, flex, dh-autoreconf
 Standards-Version: 3.9.1
 Homepage: http://www.mapserver.org/tinyows/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/tinyows.git
diff --git a/debian/rules b/debian/rules
index 67fc0dd..a8ac3ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,104 +1,64 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-include /usr/share/quilt/quilt.make
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 
 # Path to the debian directory
-DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname )
-UPSTREAM_VERSION ?=$(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-# 	Add here commands to configure the package.
-	autoconf -o $(CURDIR)/configure $(CURDIR)/configure.in
-	$(CURDIR)/configure --prefix=/usr --with-shp2pgsql=/usr/bin/shp2pgsql
-	touch configure-stamp
+DEBIAN_DIR := $(shell echo ${MAKEFILE_LIST} | awk '{print $$1}' | xargs dirname)
+UPSTREAM_VERSION ?= $(shell uscan --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 
+%:
+	dh $@ --with autoreconf
 
-build: build-stamp
-
-build-stamp:$(QUILT_STAMPFN) configure-stamp
-	dh_testdir
-
-# 	Add here commands to compile the package.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tinyows
-#	docbook-to-man debian/tinyows.sgml > tinyows.1
-
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp
-
-# 	Add here commands to clean up after the build process.
-	if test -f $(CURDIR)/Makefile; then $(MAKE) -f $(CURDIR)/Makefile clean; fi
-
+override_dh_clean:
 	dh_clean -Xautom4te.cache
 
-install: build
+override_dh_auto_configure:
+	dh_auto_configure -- --with-shp2pgsql=/usr/bin/shp2pgsql
+
+override_dh_auto_install:
 	dh_testdir
 	dh_testroot
 	dh_prep  
 	dh_installdirs
 
-# 	Add here commands to install the package into debian/tinyows.
-	#make install does almost nothing, so we do it here
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/tinyows install
+	# make install does almost nothing, so we do it here
+	# $(MAKE) DESTDIR=$(CURDIR)/debian/tinyows install
+
 	cp $(CURDIR)/tinyows $(CURDIR)/debian/tinyows/usr/lib/cgi-bin/
+
 	mkdir -p $(CURDIR)/debian/tinyows/usr/share/tinyows
 	cp -rf schema $(CURDIR)/debian/tinyows/usr/share/tinyows/
-#	copy demo & test files
+
+	# copy demo & test files
 	cp -r $(CURDIR)/demo/ $(CURDIR)/debian/tinyows/usr/share/tinyows/
 	cp -r $(CURDIR)/test/ $(CURDIR)/debian/tinyows/usr/share/tinyows/
-# 	remove unnecessary files
+
+	# remove unnecessary files
 	rm -f $(CURDIR)/debian/tinyows/usr/share/tinyows/demo/world*
 	rm -f $(CURDIR)/debian/tinyows/usr/share/tinyows/demo/france*
 
-
-# Build architecture-independent files here.
-binary-indep: install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	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
+override_dh_install:
+	dh_install --list-missing
 
 get-orig-source:
 	cd ${DEBIAN_DIR}/.. && uscan --force-download

-- 
A simple WFS-T server