Switch to dh v7.

  - Bump Build-Depends on debhelper to (>= 7.0.50).
  - Bump Build-Depends on autotools-dev to (>= 20100122.1) for the
    autotools_dev dh addon.
  - Convert debian/rules to dh.

3 files changed, 17 insertions, 114 deletions

diff --git a/debian/changelog b/debian/changelog
index 2437590..3bb70cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,16 @@ rsyslog (4.6.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/patches/02-set-correct-default-for-buffered-writing.patch
     - Removed, merged upstream.
-  * Switch to source format 3.0 (quilt)
+  * Switch to source format 3.0 (quilt).
     - Add debian/source/format.
     - Drop Build-Depends on quilt.
     - Remove debian/README.source.
     - Remove /usr/share/quilt/quilt.make include from debian/rules.
+  * Switch to dh v7.
+    - Bump Build-Depends on debhelper to (>= 7.0.50).
+    - Bump Build-Depends on autotools-dev to (>= 20100122.1) for the
+      autotools_dev dh addon.
+    - Convert debian/rules to dh.
 
  -- Michael Biebl <biebl@debian.org>  Wed, 07 Jul 2010 15:40:46 +0200
 
diff --git a/debian/control b/debian/control
index 999a2df..7e29ace 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rsyslog
 Section: admin
 Priority: important
 Maintainer: Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 7.0.9), autotools-dev, zlib1g-dev, libmysqlclient-dev, libpq-dev, libkrb5-dev, libgnutls-dev, librelp-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.50), autotools-dev (>= 20100122.1), zlib1g-dev, libmysqlclient-dev, libpq-dev, libkrb5-dev, libgnutls-dev, librelp-dev, pkg-config
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/collab-maint/rsyslog.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/rsyslog.git;a=summary
diff --git a/debian/rules b/debian/rules
index a2655ae..5d3573f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,10 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules file for the rsyslog package.
-# Author: Michael Biebl <biebl@debian.org>
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@ --with autotools_dev
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: $(QUILT_STAMPFN) configure
-	dh_testdir
-	# Add here commands to configure the package.
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
+override_dh_auto_configure:
+	dh_auto_configure -- \
 		--enable-mysql \
 		--enable-pgsql \
 		--enable-mail \
@@ -43,86 +12,15 @@ endif
 		--enable-gssapi-krb5 \
 		--enable-gnutls \
 		--enable-relp \
-		--disable-testbench \
-		CFLAGS="$(CFLAGS)"
-
-
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE)
-
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-	# Add here commands to install the package into debian/rsyslog.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+		--disable-testbench
 
+override_dh_auto_install:
+	dh_auto_install
 	install --mode=644 -D plugins/ommysql/createDB.sql debian/rsyslog-mysql/usr/share/dbconfig-common/data/rsyslog-mysql/install/mysql
 	install --mode=644 -D plugins/ompgsql/createDB.sql debian/rsyslog-pgsql/usr/share/dbconfig-common/data/rsyslog-pgsql/install/pgsql
 
-# Build architecture-independent files here.
-binary-indep: DH_OPTIONS=-i
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_link
-	dh_lintian
-	dh_compress -X .conf
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+override_dh_compress:
+	dh_compress -X rsyslog-example.conf
 
-# Build architecture-dependent files here.
-binary-arch: DH_OPTIONS=-a
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdirs
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installlogcheck
-	dh_install
-	dh_installlogrotate
+override_dh_installinit:
 	dh_installinit -R -- start 10 2 3 4 5 . start 30 0 6 . stop 90 1 .
-	dh_installman
-	dh_installdebconf
-	dh_link
-	dh_lintian
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install