summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2017-06-22 04:16:38 +0200
committerAxel Beckert <abe@deuxchevaux.org>2017-06-22 04:16:38 +0200
commit2b2aa74d2a8348ee8d9e1a5c7ca75d88f504772e (patch)
tree6e2d9584dbae131425cc13bb914a6e3408aa84fb
parent42e6d850411b3d2956c2e741795576ff35c66e21 (diff)
downloadzsh-2b2aa74d2a8348ee8d9e1a5c7ca75d88f504772e.tar.gz
zsh-2b2aa74d2a8348ee8d9e1a5c7ca75d88f504772e.zip
Bump debhelper compatibility to 10. Update versioned build-dependency on debhelper accordingly. Remove all --parallel options from debian/rules.
-rw-r--r--debian/compat2
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules16
3 files changed, 10 insertions, 10 deletions
diff --git a/debian/compat b/debian/compat
index ec635144f..f599e28b8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index bf304705c..79a42d9a3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Build-Depends: autotools-dev,
bsdmainutils,
cm-super-minimal,
- debhelper (>= 9.20151116~),
+ debhelper (>= 10),
dh-autoreconf,
dpkg-dev (>= 1.16.2~),
ghostscript,
diff --git a/debian/rules b/debian/rules
index cd5211915..77ac1e303 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,20 +49,20 @@ BUILT_USING=$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), '
build: build-arch build-indep
build-arch: configure-stamp
- dh_auto_build -B obj --parallel
+ dh_auto_build -B obj
if dpkg-architecture -qDEB_BUILD_ARCH_OS | grep -qv hurd; then \
- HOME="$(CURDIR)/obj/testhome" ZTST_verbose=1 dh_auto_test -B obj --parallel; \
+ HOME="$(CURDIR)/obj/testhome" ZTST_verbose=1 dh_auto_test -B obj; \
fi
touch $@
build-indep: configure-stamp
- dh_auto_build -B obj --parallel -- pdf
+ dh_auto_build -B obj -- pdf
touch $@
build-static: configure-static-stamp
dh_testdir
- dh_auto_build -B obj-static --parallel
- #HOME="$(CURDIR)/obj-static/testhome" ZTST_verbose=1 dh_auto_test -B obj-static --parallel || true
+ dh_auto_build -B obj-static
+ #HOME="$(CURDIR)/obj-static/testhome" ZTST_verbose=1 dh_auto_test -B obj-static || true
touch $@
build-debug: DEB_BUILD_OPTIONS+=debug
@@ -96,9 +96,9 @@ clean:
dh_autoreconf_clean
dh_autotools-dev_restoreconfig
rm -f build build-static
- dh_auto_clean -B obj --parallel
- dh_auto_clean -B obj-static --parallel
- dh_auto_clean --parallel
+ dh_auto_clean -B obj
+ dh_auto_clean -B obj-static
+ dh_auto_clean
dh_clean
binary-indep: build-indep binary-arch-dynamic