From 691c7b4d5b38739a4b3ff472c28f3f76072706ac Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Sat, 29 May 2010 15:45:36 +0200 Subject: [PATCH] Update to Debhelper 7 and dh Bump build-deps accordingly. --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 2 +- debian/rules | 81 +++--------------------------------------------- 4 files changed, 7 insertions(+), 79 deletions(-) diff --git a/debian/changelog b/debian/changelog index f0f5a47..29cfbf3 100644 --- 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 Sat, 29 May 2010 14:46:46 +0200 diff --git a/debian/compat b/debian/compat index 7ed6ff8..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +7 diff --git a/debian/control b/debian/control index e6897a1..2a12b1f 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: eweouz Section: mail Priority: optional Maintainer: Tollef Fog Heen -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 6e87d5b..f795087 100755 --- 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 -- 2.39.5