rename systemd service file to respect naming conventions.

diff --git a/debian/changelog b/debian/changelog
index 60835f5d4c6809daab4b07864c720b101ef95b13..81cf05670865b352ee89966aca34fa1a09abb02f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ collectd (5.5.0-3) UNRELEASED; urgency=medium
     - Strip out non-deterministic bits out of generated jar files.
   * debian/collectd-core.overrides:
     - Update 'capitalization-error-in-description' lintian override.
+  * debian/rules, debian/collectd-core.collectd.service:
+    - Rename systemd service file to collectd-core.collectd.service, to honour
+      debhelper's naming convention.
 
  -- Marc Fournier <marc.fournier@camptocamp.com>  Tue, 25 Aug 2015 06:55:52 +0200
 

diff --git a/debian/collectd-core.collectd.service b/debian/collectd-core.collectd.service
new file mode 100644 (file)
index 0000000..2fee302
--- /dev/null
+++ b/debian/collectd-core.collectd.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=Statistics collection and monitoring daemon
+After=local-fs.target network.target
+Requires=local-fs.target network.target
+Documentation=man:collectd(1)
+Documentation=man:collectd.conf(5)
+Documentation=https://collectd.org
+
+[Service]
+Type=notify
+NotifyAccess=main
+EnvironmentFile=-/etc/default/collectd
+ExecStart=/usr/sbin/collectd
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target

diff --git a/debian/collectd.service b/debian/collectd.service
deleted file mode 100644 (file)
index 2fee302..0000000
--- a/debian/collectd.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Statistics collection and monitoring daemon
-After=local-fs.target network.target
-Requires=local-fs.target network.target
-Documentation=man:collectd(1)
-Documentation=man:collectd.conf(5)
-Documentation=https://collectd.org
-
-[Service]
-Type=notify
-NotifyAccess=main
-EnvironmentFile=-/etc/default/collectd
-ExecStart=/usr/sbin/collectd
-Restart=always
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target

diff --git a/debian/rules b/debian/rules
index 3960dff718620145034dd2c1062d89703aa81d33..0da5b2bebde227c405990e67a406900ca458dc4f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -281,7 +281,7 @@ binary-arch: build install-arch
                && rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \
                && rm -f lib/Collectd/Graph/MetaData.pm )
        dh_installdebconf -a
-       dh_systemd_enable -pcollectd-core --name=collectd collectd.service
+       dh_systemd_enable -pcollectd-core --name=collectd
        dh_installinit -pcollectd-core --name=collectd -- defaults 95
        dh_systemd_start -pcollectd-core
        dh_link -a