diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-05-16 04:06:43 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-05-16 04:06:43 +0200 |
| commit | 7fdbb15da635c9b0a58054a35d67b80a5e8b2aff (patch) | |
| tree | 06a3314dff94e5fd7c8bc07bce20e3a7c8f6a733 | |
| parent | df3900276fbaef498dcaf15f2dea78d3ad297d1c (diff) | |
| download | screen-7fdbb15da635c9b0a58054a35d67b80a5e8b2aff.tar.gz | |
Bump dh compat to >= 9, use dh_auto_{configure,build}
* Update versioned debhelper build-dependency
* Drop DPKG_EXPORT_BUILDFLAGS and /usr/share/dpkg/buildflags.mk
* Drop manual DEB_BUILD_OPTIONS parsing
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/compat | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 18 |
4 files changed, 11 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index 2d31a37..1ec4b00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,12 @@ screen (4.1.0~20120320gitdb59704-8) UNRELEASED; urgency=low (Closes: #707530) * Use doc/screen.info* instead of listing every file indiviually in debian/info. + * Bump debhelper compatibility to 9 + + Update versioned debhelper build-dependency + * Revamp debian/rules + + Use dh_auto_{configure,build} + + Drop DPKG_EXPORT_BUILDFLAGS and /usr/share/dpkg/buildflags.mk + + Drop manual DEB_BUILD_OPTIONS parsing * Apply wrap-and-sort. -- Axel Beckert <abe@debian.org> Thu, 16 May 2013 03:15:42 +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 316b64e..767db61 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Axel Beckert <abe@debian.org> Uploaders: Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de> Standards-Version: 3.9.3 -Build-Depends: debhelper (>> 7), +Build-Depends: debhelper (>= 9~), dh-autoreconf, dpkg-dev (>= 1.16.1~), libncursesw5-dev, diff --git a/debian/rules b/debian/rules index ff2d5f6..3b774d8 100755 --- a/debian/rules +++ b/debian/rules @@ -12,15 +12,6 @@ ROOT := $(CURDIR)/debian/$(package) # statically define this... sucko TTYGROUP := 5 -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - -ifeq ($(findstring noopt,$(DEB_BUILD_OPTIONS)),noopt) -CC_OPTFLAGS := -O0 -g3 -else -CC_OPTFLAGS := -O2 -g -endif - clean: dh_testdir dh_testroot @@ -33,10 +24,7 @@ configure: configure-stamp configure-stamp: dh_testdir dh_autoreconf - ./configure --prefix=/usr \ - $(shell dpkg-buildflags --export=configure) \ - --infodir='$$(prefix)/share/info' \ - --mandir='$$(prefix)/share/man' \ + dh_auto_configure -- \ --with-socket-dir=/var/run/screen \ --enable-pam \ --with-pty-mode=0620 \ @@ -56,8 +44,8 @@ build-arch: build-stamp build-indep: build-stamp build-stamp: configure-stamp dh_testdir - $(MAKE) CFLAGS+='$(CC_OPTFLAGS) -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers' - $(MAKE) CFLAGS+='$(CC_OPTFLAGS) -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers' -C doc + dh_auto_build -- CFLAGS+='-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers' + dh_auto_build -Ddoc -- CFLAGS+='-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers' touch $@ install: install-stamp |