[SCM] ffmpeg/master: Use debhelper compat 10
aca-guest at users.alioth.debian.org
aca-guest at users.alioth.debian.org
Sat Oct 22 21:24:11 UTC 2016
The following commit has been merged in the master branch:
commit 3eb3b650fdedd09155c5694fcc875b6c2461130f
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date: Sat Oct 22 21:10:24 2016 +0200
Use debhelper compat 10
Parallel building is now the default.
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index afcb770..313fc41 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends-Indep:
node-less
Build-Depends:
# needed for dh
- debhelper (>= 9.20141010),
+ debhelper (>= 10),
# for build-profile support
dpkg-dev (>= 1.17.14),
# --enable-libflite
diff --git a/debian/rules b/debian/rules
index 15823cb..8ffe857 100755
--- a/debian/rules
+++ b/debian/rules
@@ -186,9 +186,8 @@ export DPKG_EXPORT_BUILDFLAGS
include /usr/share/dpkg/buildflags.mk
# Use the default debhelper scripts, where possible.
-# Enable parallel building.
%:
- dh $@ --parallel
+ dh $@
# Add configuration options:
override_dh_auto_configure:
--
ffmpeg packaging
More information about the pkg-multimedia-commits
mailing list