Merge tag 'debian/1.8.18-7' into develop

Bugfix release

6 files changed, 13 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 40d154e..4d4749e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,21 @@
-ipmitool (1.8.18-7) UNRELEASED; urgency=medium
+ipmitool (1.8.18-7) unstable; urgency=medium
 
-  * debian/watch: Use tags instead releases.
+  * debian/watch: Use tags instead releases to fix the wrong format.
   * Migrate to debhelper 12:
     - Change debian/compat to 12.
     - Bump minimum debhelper version in debian/control to >= 12.
   * Declare compliance with Debian Policy 4.4.0 (No changes needed).
   * debian/control: Add missing Depend init_system_helpers to fix
-      lintan warning.
+      lintan warning missing-versioned-depends-on-init-system-helpers.
   * New debian/patches/0615-manpage_typo.patch: Fix typos in man pages.
   * Add DEP 8 smoketest (Closes: #903676).
-      Thanks to dann frazier <dannf@debian.org>.
+      Thanks to "Dann Frazier" <dannf@debian.org>.
+  * Remove not longer needed debian/ipmitool.ipmievd.default (Closes: #907832).
+    - New debian/ipmitool.maintscript to remove /etc/default/ipmitool.
+    - Add IPMIEVD_OPTIONS from /etc/default/ipmitool into
+      debian/ipmitool.ipmievd.service.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sat, 13 Jul 2019 12:52:23 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 20 Jul 2019 10:59:12 +0200
 
 ipmitool (1.8.18-6) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index faa77ad..172d14f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends:
  debhelper (>> 12),
- init-system-helpers (>> 0.1),
+ init-system-helpers (>> 1.50),
  libncurses-dev,
  libfreeipmi-dev [!hurd-i386],
  libreadline-dev,
diff --git a/debian/ipmitool.ipmievd.default b/debian/ipmitool.ipmievd.default
deleted file mode 100644
index 12439e0..0000000
--- a/debian/ipmitool.ipmievd.default
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is a shell script fraction
-
-#
-# To enable ipmievd set ENABLED="true" for sysvinit (ignored by systemd)
-#
-# This is disabled because Debian Policy Manual section 9.3.3.1
-#
-#E N A B L E D="false"
-
-
-# Options to the daemon ipmievd(8).
-#
-IPMIEVD_OPTIONS="open daemon"
diff --git a/debian/ipmitool.lintian-overrides b/debian/ipmitool.lintian-overrides
index 94a5070..00696e1 100644
--- a/debian/ipmitool.lintian-overrides
+++ b/debian/ipmitool.lintian-overrides
@@ -1,4 +1,4 @@
 #
 # see bug #932378
 #
-ipmitool: missing-versioned-depends-on-init-system-helpers postinst:20 "update-rc.d defaults-disabled" needs init-system-helpers >= 1.50
+ipmitool: missing-versioned-depends-on-init-system-helpers postinst:23 "update-rc.d defaults-disabled" needs init-system-helpers >= 1.50
diff --git a/debian/ipmitool.maintscript b/debian/ipmitool.maintscript
new file mode 100644
index 0000000..92457ee
--- /dev/null
+++ b/debian/ipmitool.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/default/ipmitool 1.8.18-6~
diff --git a/debian/systemd/ipmitool.ipmievd.service b/debian/systemd/ipmitool.ipmievd.service
index e7a8528..fdae14f 100644
--- a/debian/systemd/ipmitool.ipmievd.service
+++ b/debian/systemd/ipmitool.ipmievd.service
@@ -3,8 +3,7 @@ Description=IPMI event daemon
 
 [Service]
 Type=forking
-EnvironmentFile=-/etc/default/ipmievd
-ExecStart=/usr/sbin/ipmievd $IPMIEVD_OPTIONS
+ExecStart=/usr/sbin/ipmievd open daemon
 
 [Install]
 WantedBy=multi-user.target