diff --git a/debian/changelog b/debian/changelog index bfaabed..9020be2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ nut (2.7.4-9) UNRELEASED; urgency=medium [ Laurent Bigonville ] * Switch from cdbs to debhelper sequence + * Bump debhelper compatibility version to 12 * Add libltdl-dev to the build-dependencies and fix FTBFS when it is installed (Closes: #831740) * debian/control: Bump Standards-Version to 4.4.0 (no further changes) @@ -33,7 +34,7 @@ nut (2.7.4-9) UNRELEASED; urgency=medium by nut-server initscript * debian/nut-client.lintian-overrides: Drop unused override - -- Laurent Bigonville Sat, 27 Jul 2019 15:16:11 +0200 + -- Laurent Bigonville Sat, 27 Jul 2019 17:36:25 +0200 nut (2.7.4-8) unstable; urgency=medium diff --git a/debian/compat b/debian/compat index ec63514..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +12 diff --git a/debian/control b/debian/control index 4ebf1ce..b96f87f 100644 --- a/debian/control +++ b/debian/control @@ -3,9 +3,7 @@ Section: admin Priority: optional Maintainer: Arnaud Quette Uploaders: Laurent Bigonville -Build-Depends: autotools-dev, - debhelper (>= 9.20160709~), - dh-autoreconf, +Build-Depends: debhelper (>= 12), dh-python, libfreeipmi-dev (>= 0.8.5) [!hurd-i386], libgd-dev | libgd2-xpm-dev | libgd2-noxpm-dev, @@ -56,6 +54,7 @@ Suggests: nut-cgi, nut-ipmi, nut-snmp, nut-xml Conflicts: nut-hal-drivers Replaces: nut (<< 2.6.1-2~) Breaks: nut (<< 2.6.1-2~) +Pre-Depends: ${misc:Pre-Depends} Description: network UPS tools - core system Network UPS Tools (NUT) is a client/server monitoring system that allows computers to share uninterruptible power supply (UPS) and @@ -75,6 +74,7 @@ Recommends: bash-completion Suggests: nut-monitor Replaces: nut (<< 2.6.1-2~), nut-server (<< 2.6.3-1~), ups-monitor Breaks: nut (<< 2.6.1-2~), nut-server (<< 2.6.3-1~) +Pre-Depends: ${misc:Pre-Depends} Description: network UPS tools - clients Network UPS Tools (NUT) is a client/server monitoring system that allows computers to share uninterruptible power supply (UPS) and diff --git a/debian/rules b/debian/rules index 376931d..c56bd51 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ ifneq ($(shell which asciidoc),) endif %: - dh $@ --with python2 --with python3 --with autoreconf --with systemd + dh $@ --no-parallel --with python2 --with python3 override_dh_auto_configure: dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) @@ -43,9 +43,6 @@ override_dh_auto_configure: override_dh_autoreconf: dh_autoreconf --as-needed -override_dh_install: - dh_install --list-missing - override_dh_auto_install-arch: dh_auto_install -a @@ -131,10 +128,7 @@ override_dh_auto_install-indep: done override_dh_installinit: - dh_installinit --restart-after-upgrade --error-handler=handle_start_failure - -override_dh_systemd_start: - dh_systemd_start --restart-after-upgrade + dh_installinit --error-handler=handle_start_failure override_dh_compress: dh_compress -X.pdf