Update to Debhelper 7 and dh

Bump build-deps accordingly.

diff --git a/debian/changelog b/debian/changelog
index f0f5a470d0263de2b50ef36b97ba4647cc0b5cb2..29cfbf307a5488989e3ade46fd00a875231b8784 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ eweouz (0.6) unstable; urgency=low
     one address is returned.
   * Demote gnus | wl to suggests, they're often used with eweouz, but gnus
     at least ships with Emacs itself.
+  * Update to Debhelper 7 and dh, bump build-deps accordingly.
 
  -- Tollef Fog Heen <tfheen@debian.org>  Sat, 29 May 2010 14:46:46 +0200
 

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7

diff --git a/debian/control b/debian/control
index e6897a1096ba50e71315d5fa45c97bdd575e9a9b..2a12b1f27088b6e73c7d5fcde1dfc085d5ce9350 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: eweouz
 Section: mail
 Priority: optional
 Maintainer: Tollef Fog Heen <tfheen@debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, emacs23 | emacsen, libedataserver1.2-dev, libebook1.2-dev, libgconf2-dev, libglib2.0-dev
+Build-Depends: debhelper (>= 7.0.50), autotools-dev, emacs23 | emacsen, libedataserver1.2-dev, libebook1.2-dev, libgconf2-dev, libglib2.0-dev
 Standards-Version: 3.8.4
 
 Package: eweouz

diff --git a/debian/rules b/debian/rules
index 6e87d5bc1a1282583d692def77240b75166eed69..f79508789cdeb5624796c0e14c250626ba64eb8d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,81 +1,8 @@
 #! /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.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+       dh $@ --builddirectory=build --parallel
 
-# 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)
-
-
-build-$(DEB_BUILD_GNU_TYPE)/config.status: 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
-       mkdir build-$(DEB_BUILD_GNU_TYPE)
-       cd build-$(DEB_BUILD_GNU_TYPE) && ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" --with-lispdir=\$${datarootdir}/emacs/site-lisp/eweouz
-
-build: build-stamp
-build-stamp:  build-$(DEB_BUILD_GNU_TYPE)/config.status
-       dh_testdir
-
-       $(MAKE) -C build-$(DEB_BUILD_GNU_TYPE)
-       touch $@
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp 
-
-       # Add here commands to clean up after the build process.
-       rm -rf build-$(DEB_BUILD_GNU_TYPE)
-       rm -f config.sub config.guess
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       # Add here commands to install the package into debian/eweouz.
-       $(MAKE) -C build-$(DEB_BUILD_GNU_TYPE) DESTDIR=$(CURDIR)/debian/eweouz install
-
-# 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_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-       dh_installemacsen
-       dh_installman
-       dh_link
-       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 
+override_dh_auto_configure:
+       dh_auto_configure --builddirectory=build --parallel -- --with-lispdir=\$${datarootdir}/emacs/site-lisp/eweouz