Merge branch 'master' into next

[i3/i3] / debian / rules

diff --git a/debian/rules b/debian/rules
index 02a8fca65fc60922342f010826ba2104e64069fb..55c72b514ead804081879a20e9362bf8150c06ce 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
@@ -26,10 +33,13 @@ binary-indep: install
 binary: binary-arch binary-indep
 
 override_dh_auto_build:
-       $(MAKE) TERM_EMNU=x-terminal-emulator
+       $(MAKE)
        $(MAKE) -C man
        $(MAKE) -C docs
 
+override_dh_installchangelogs:
+       dh_installchangelogs RELEASE-NOTES-4.6
+
 override_dh_install:
        $(MAKE) DESTDIR=$(CURDIR)/debian/i3-wm/ install