Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More changes for 5.5.0-3 #3

Merged
merged 5 commits into from
Sep 12, 2015
Merged

More changes for 5.5.0-3 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1dad48e
rename systemd service file to respect naming conventions.
Sep 1, 2015
8d89cca
systemd service file: check for config file presence.
Sep 1, 2015
fd43093
systemd service file: make sure `collectd -t` succeeds
Sep 1, 2015
ce36566
update my email address
Sep 1, 2015
72f2e99
better phrasing in changelog
Sep 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
collectd (5.5.0-3) UNRELEASED; urgency=medium

* debian/rules, debian/control:
- Avoid hiding compiler options, allowing the buildd log scanner to do
it's job.
- Avoid hiding compiler options at build time, allowing the buildd log
scanner to do it's job.
- Disable smart plugin on non-linux platforms, due to missing
libatasmart-dev build-dependency.
- Strip out non-deterministic bits out of generated jar files.
* debian/collectd-core.overrides:
- Update 'capitalization-error-in-description' lintian override.

-- Marc Fournier <[email protected]> Tue, 25 Aug 2015 06:55:52 +0200
* debian/rules, debian/collectd-core.collectd.service:
- Rename systemd service file to collectd-core.collectd.service, to honour
debhelper's naming convention.
* debian/collectd-core.collectd.service:
- Check for configuration file presence before starting the daemon.
- Check for configuration file validity before starting the daemon.
* debian/control, debian/changelog:
- Update my email address to match identity of current GPG key.

-- Marc Fournier <[email protected]> Tue, 25 Aug 2015 06:55:52 +0200

collectd (5.5.0-2) unstable; urgency=low

Expand Down
2 changes: 2 additions & 0 deletions debian/collectd.service → debian/collectd-core.collectd.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Description=Statistics collection and monitoring daemon
After=local-fs.target network.target
Requires=local-fs.target network.target
ConditionPathExists=/etc/collectd/collectd.conf
Documentation=man:collectd(1)
Documentation=man:collectd.conf(5)
Documentation=https://collectd.org
Expand All @@ -10,6 +11,7 @@ Documentation=https://collectd.org
Type=notify
NotifyAccess=main
EnvironmentFile=-/etc/default/collectd
ExecStartPre=/usr/sbin/collectd -t
ExecStart=/usr/sbin/collectd
Restart=always
RestartSec=10
Expand Down
2 changes: 1 addition & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Source: collectd
Section: utils
Priority: optional
Maintainer: Sebastian Harl <[email protected]>
Uploaders: Marc Fournier <marc[email protected]>
Uploaders: Marc Fournier <marc@bl.uem.li>
Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), dh-strip-nondeterminism,
bison, flex, autotools-dev, libltdl-dev, pkg-config,
iptables-dev (>= 1.4.3.2-2) [linux-any],
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down