From ed4fa7a16e182e97324d5eaa357bbcd917216782 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sat, 2 May 2015 18:38:27 +0200 Subject: [PATCH] Bump debhelper compat level to 9. --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 2 +- debian/rules | 10 +--------- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5074581..90ce102 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x11-xserver-utils (7.7+4) UNRELEASED; urgency=medium * xmodmap 1.0.9. * xrandr 1.4.3. * Bump x11proto-core-dev build-dep to 7.0.25. + * Bump debhelper compat level to 9. -- Julien Cristau Sat, 02 May 2015 18:30:26 +0200 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 e8003d4..82d43ec 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Debian X Strike Force Build-Depends: - debhelper (>= 7.0.50), + debhelper (>= 9), dh-autoreconf, pkg-config, x11proto-core-dev (>= 7.0.25), diff --git a/debian/rules b/debian/rules index 338b5d4..e0bfed8 100755 --- a/debian/rules +++ b/debian/rules @@ -19,11 +19,6 @@ SUBDIRS=$(DEF_SUBDIRS) CONFIG_STAMPS = $(addprefix $(STAMP_DIR)/configure-, $(SUBDIRS)) BUILD_STAMPS = $(addprefix $(STAMP_DIR)/build-,$(SUBDIRS)) -CFLAGS = `dpkg-buildflags --get CFLAGS` -CFLAGS += -Wall -LDFLAGS = `dpkg-buildflags --get LDFLAGS` -CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` - %: dh $@ --with autoreconf,quilt --parallel @@ -38,10 +33,7 @@ override_dh_auto_configure: $(CONFIG_STAMPS) $(STAMP_DIR)/configure-%: mkdir -p $(STAMP_DIR) dh_auto_configure -D$* -B$*-build -- \ - --disable-silent-rules \ - CFLAGS="$(CFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" + --disable-silent-rules >$@ override_dh_auto_build: $(BUILD_STAMPS)