Drop both dh-autoreconf/dh-systemd when using compat 10.

3 files changed, 11 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index 4e06f03..010f38b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ ipmiutil (3.0.0-3) UNRELEASED; urgency=medium
       ipmi_port at installation.
     - New debian/patches/0710-systemd.patch to remove supported
       characters.
+    (Thanks to Andreas Henriksson <andreas@fatal.se>)
+  * Drop both dh-autoreconf/dh-systemd from both build-depends
+    and dh --with arguments because this is all defaults when
+    using dh compat 10.
+    (Thanks to Andreas Henriksson <andreas@fatal.se>)
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Tue, 20 Dec 2016 11:55:42 +0100
 
diff --git a/debian/control b/debian/control
index e64b1a9..597195f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Build-Depends:
  autotools-dev,
  debhelper (>= 10),
- dh-autoreconf,
- dh-systemd (>= 1.5),
  libfreeipmi-dev (>= 1.1.5) | libopenipmi-dev (>=2.0.18),
  libssl1.0-dev,
  libtool-bin
diff --git a/debian/rules b/debian/rules
index 80520ed..2fa6c72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,10 @@ CFLAGS += -fPIC
 CONFPARA = --enable-gpl --enable-useflags --enable-libsensors
 
 %:
-	dh $@  --with autotools-dev --with systemd --with autoreconf
+	dh $@  --with autotools-dev
 
 override_dh_auto_configure:
-	$(CURDIR)/beforeconf.sh 
+	$(CURDIR)/beforeconf.sh
 	dh_auto_configure -- $(CONFPARA)
 
 override_dh_autoreconf:
@@ -35,4 +35,7 @@ override_dh_installinit:
 
 override_dh_systemd_enable:
 	dh_systemd_enable --no-enable ipmi_port.service
-
+	dh_systemd_enable --name=ipmi_info
+	dh_systemd_enable --name=ipmiutil_asy
+	dh_systemd_enable --name=ipmiutil_evt
+	dh_systemd_enable --name=ipmiutil_wdt