Merge branch 'master' into next

[i3/i3] / debian / rules

diff --git a/debian/rules b/debian/rules
index a488469d717579930d52268fa827d506f79aa760..ab386da375f0c2217a9770d1c8513c9469a8331b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,14 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
 
-build: build-stamp
+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
@@ -30,6 +37,9 @@ override_dh_auto_build:
        $(MAKE) -C man
        $(MAKE) -C docs
 
+override_dh_installchangelogs:
+       dh_installchangelogs RELEASE-NOTES-4.7
+
 override_dh_install:
        $(MAKE) DESTDIR=$(CURDIR)/debian/i3-wm/ install