merge 1.8.18-5 into git

3 files changed, 7 insertions, 8 deletions

diff --git a/debian/changelog b/debian/changelog
index cd99fb4..a417858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,10 @@
-ipmitool (1.8.18-5) UNRELEASED; urgency=medium
+ipmitool (1.8.18-5) unstable; urgency=medium
 
-  * debian/rules:
-    - At dh_systemd_enable use debian/ipmitool.ipmievd.service
-      instead ipmievd.service.
-  * Declare compliance with Debian Policy 4.1.1. (No changes needed).
+  * Team upload.
+  * Use dh_systemd_enable --name to install ipmitool.ipmievd.service.
+    (closes: #879063)
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 14 Oct 2017 13:47:51 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 14 Nov 2017 07:58:01 +0100
 
 ipmitool (1.8.18-4) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 0dab39b..a5b3b1b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
  libfreeipmi-dev [!hurd-i386],
  libreadline-dev,
  libssl-dev
-Standards-Version: 4.1.1
+Standards-Version: 4.0.0
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git
 Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/ipmitool.git
 Homepage: https://sourceforge.net/projects/ipmitool/
diff --git a/debian/rules b/debian/rules
index 1d58eb0..2862de5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ override_dh_installinit:
 	dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed
 
 override_dh_systemd_enable:
-	dh_systemd_enable --no-enable debian/ipmitool.ipmievd.service
+	dh_systemd_enable --no-enable --name=ipmievd
 
 override_dh_auto_configure:
 	dh_auto_configure -- --prefix=/usr --with-kerneldir --mandir=/usr/share/man --enable-intf-dummy $(extra_config_opts)