debian: Switch to debhelper 10

debhelper 10 is much nicer with the installation part from
a dirty tree, so you can just fix some stuff breaking the
install step and then continue building with debuild -b -nc
until you have fixed all your stuff.

It also has some other advantages, of course, like some
bug fixes in shell escaping for maintscript, or systemd
helper changes.

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

diff --git a/debian/control b/debian/control
index c383e2fc1350b3547b8b935a1683bbde93efbe0e..fea066dcb8eea5f3ba60e63d270588ef272c1fb3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>,
  Julian Andres Klode <jak@debian.org>,
  David Kalnischkies <donkult@debian.org>
 Standards-Version: 3.9.8
  Julian Andres Klode <jak@debian.org>,
  David Kalnischkies <donkult@debian.org>
 Standards-Version: 3.9.8

-Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9.20141010), libdb-dev,
+Build-Depends: dpkg-dev (>= 1.17.14), debhelper (>= 9.20160709~), libdb-dev,

  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
  zlib1g-dev, libbz2-dev, liblzma-dev, liblz4-dev (>= 0.0~r126),
  xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),
  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
  zlib1g-dev, libbz2-dev, liblzma-dev, liblz4-dev (>= 0.0~r126),
  xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),

diff --git a/debian/rules b/debian/rules
index ab101c2e1ab3bdc33990052cdc42856cb4b807a2..cc2e36fbae00b8f46005cb6f2655beb38dbdfa32 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=0
 export CTEST_OUTPUT_ON_FAILURE=1
 
 %:
 export CTEST_OUTPUT_ON_FAILURE=1
 
 %:

-       dh $@ --with systemd --parallel --buildsystem=cmake
+       dh $@

 
 override_dh_install-indep:
        dh_movefiles
 
 override_dh_install-indep:
        dh_movefiles