summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-30 16:52:54 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-03-30 16:52:54 +0200
commit7a765f655540e4e254f4aaaf6ea3326a57d76e59 (patch)
tree78fbc8dcfbe36b7f3499c4dc5c3017435d6fb2a1
parentb625a9423cd74481a77f816adae37db2515f4307 (diff)
parent631fa5250443f5441549bf3184830bc34b0c042e (diff)
Merge tag '3.0.8-1' into develop
New upstream release
-rw-r--r--debian/changelog8
-rw-r--r--debian/files1
l---------debian/ipmiutil_wdt.service1
-rwxr-xr-xdebian/rules18
4 files changed, 14 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index 9310caa..49161ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ipmiutil (3.0.8-1) UNRELEASED; urgency=medium
+ipmiutil (3.0.8-1) unstable; urgency=medium
* New upstream release.
- Refresh debian/patch/0700-init.patch.
@@ -9,8 +9,12 @@ ipmiutil (3.0.8-1) UNRELEASED; urgency=medium
* Migrate to debhelper 11:
- Change debian/compat to 11.
- Bump minimum debhelper version in debian/control to >= 11.
+ * debian/rules (Closes: #877211):
+ - Add --no-parallel to fix frequent parallel FTBFS.
+ Thanks to Adrian Bunk <bunk@debian.org>.
+ - Switch from deprecated dh_systemd_enable to dh_installsystemd.
- -- Jörg Frings-Fürst <debian@jff.email> Sun, 14 Jan 2018 19:53:04 +0100
+ -- Jörg Frings-Fürst <debian@jff.email> Tue, 06 Mar 2018 07:43:32 +0100
ipmiutil (3.0.7-1) unstable; urgency=medium
diff --git a/debian/files b/debian/files
new file mode 100644
index 0000000..f83d373
--- /dev/null
+++ b/debian/files
@@ -0,0 +1 @@
+ipmiutil_3.0.8-1_source.buildinfo utils optional
diff --git a/debian/ipmiutil_wdt.service b/debian/ipmiutil_wdt.service
new file mode 120000
index 0000000..644b77d
--- /dev/null
+++ b/debian/ipmiutil_wdt.service
@@ -0,0 +1 @@
+../scripts/ipmiutil_wdt.service \ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 5b4d955..273f1a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ CFLAGS += -fPIC
CONFPARA = --enable-gpl --enable-useflags --enable-libsensors
%:
- dh $@
+ dh $@ --no-parallel
override_dh_auto_configure:
$(CURDIR)/beforeconf.sh
@@ -26,14 +26,8 @@ override_dh_installman:
dh_installman doc/iseltime.8
dh_installman
-override_dh_systemd_enable:
- dh_systemd_enable --no-enable --name=ipmi_port
- dh_systemd_enable --name=ipmi_info
- dh_systemd_enable --no-enable --name=ipmiutil_asy
- dh_systemd_enable --no-enable --name=ipmiutil_evt
- dh_systemd_enable --name=ipmiutil_wdt
-
-override_dh_systemd_start:
- dh_systemd_start --no-start --restart-after-upgrade --name=ipmi_port
- dh_systemd_start --no-start --restart-after-upgrade --name=ipmiutil_asy
- dh_systemd_start --no-start --restart-after-upgrade --name=ipmiutil_evt
+override_dh_installsystemd:
+ dh_installsystemd debian/ipmiutil.ipmiutil_wdt.service
+ dh_installsystemd --no-enable --no-start debian/ipmiutil.ipmi_port.service
+ dh_installsystemd --no-enable --no-start debian/ipmiutil.ipmiutil_asy.service
+ dh_installsystemd --no-enable --no-start debian/ipmiutil.ipmiutil_evt.service