From 38616ccc0e5cd8f4b3d4c752ef9ed6c35720ab3e Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Thu, 17 Jan 2013 02:31:18 +0100 Subject: [PATCH] Debian package: Bump debhelper compatibility to 9 Remove inclusion of buildflags.mk from debian/rules, no more needed. --- debian/changelog | 4 +++- debian/compat | 2 +- debian/control | 2 +- debian/rules | 3 --- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4eba48e..32632c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,12 @@ conkeror (1.0~~pre+git130117-1) UNRELEASED; urgency=low * New upstream snapshot * Add support for xulrunner 18 to 20 + * Bump debhelper compatibility to 9 + - Remove inclusion of buildflags.mk from debian/rules, no more needed * Consistently use "touch $@" for stamp files. * Use dh_auto_build and dh_auto_clean. * Don't clean up stamp files manually; this is already done by dh_clean - plus debhelper compatibility level 7. + plus debhelper compatibility level >= 7. * Clean up debian/rules: - Use more debhelper magic, no more manual cp, ln, or mkdir. - Remove unnecessary comments and blank lines. 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 1341f38..6b55b8a 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: conkeror Section: web Priority: extra Maintainer: Axel Beckert -Build-Depends: debhelper (>= 7.2.3~), dpkg-dev (>= 1.16.1~) +Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.3 Homepage: http://conkeror.org/ Vcs-Browser: http://repo.or.cz/w/conkeror.git diff --git a/debian/rules b/debian/rules index 7e1eea6..0ec514f 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,6 @@ DEBIAN_VERSION := $(shell echo -n `head -1 debian/changelog | sed -e 's/^.*(\( BUILDID := $(shell echo -n `whoami`@`hostname`)_$(shell date +%s) USC = $(CURDIR)/debian/conkeror/usr/share/conkeror -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - configure: configure-stamp configure-stamp: dh_testdir -- 2.11.4.GIT