debian/compat: bump debhelper compat level to 9

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

diff --git a/debian/control b/debian/control
index 52fb1538130dae9aa9bbc45868cf68001fb02fa7..53ed78bf547e0de6d85f24265d6cf080ea6793f7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: i3-wm
 Section: x11
 Priority: extra
 Maintainer: Michael Stapelberg <stapelberg@debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 9),
                libx11-dev,
                libxcb-util0-dev (>= 0.3.8),
                libxcb-keysyms1-dev,

diff --git a/debian/i3-wm.install b/debian/i3-wm.install
new file mode 100644 (file)
index 0000000..a75e237
--- /dev/null
+++ b/debian/i3-wm.install
@@ -0,0 +1,2 @@
+etc
+usr

diff --git a/debian/rules b/debian/rules
index 7036b90d3000bd1edbc0e449dfdb11775f1ac904..843655eec8a9ca959f51ac860ee42d2080de54a1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,47 +1,17 @@
 #!/usr/bin/make -f
 # vi: ts=8 sw=8 noet
 
-DPKG_EXPORT_BUILDFLAGS = 1
--include /usr/share/dpkg/buildflags.mk
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp:
-       dh build
-       touch build-stamp
-
-clean:
-       dh clean
-
-install: build install-stamp
-install-stamp:
-       dh install
-       touch install-stamp
-
-binary-arch: install
-       dh binary-arch
-
-binary-indep: install
-       dh binary-indep
-
-binary: binary-arch binary-indep
+export V:=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 override_dh_auto_build:
-       $(MAKE)
-       $(MAKE) -C man
-       $(MAKE) -C docs
+       dh_auto_build -- all docs mans
 
 override_dh_installchangelogs:
        dh_installchangelogs RELEASE-NOTES-*
 
-override_dh_install:
-       $(MAKE) DESTDIR=$(CURDIR)/debian/i3-wm/ install
-
 override_dh_strip:
        dh_strip --dbg-package=i3-wm-dbg
+
+%:
+       dh $@ --parallel