Commit e280f950 authored by Sebastian Harl's avatar Sebastian Harl
Browse files

Merge pull request #2 from mfournier/preparing-5.5.0-3

Preparing for 5.5.0-3
parents 44de5b8d 5aba2b46
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.
- 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 <marc.fournier@camptocamp.com> Tue, 25 Aug 2015 06:55:52 +0200
collectd (5.5.0-2) unstable; urgency=low
* debian/rules:
......
......@@ -4,6 +4,7 @@ collectd-core [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel]: shlib-with-non-p
# All plugin names are spelled in lower-case.
collectd-core: capitalization-error-in-description apache Apache
collectd-core: capitalization-error-in-description mysql MySQL
collectd-core: capitalization-error-in-description openldap OpenLDAP
collectd-core: capitalization-error-in-description postgresql PostgreSQL
collectd-core: capitalization-error-in-description python Python
......
......@@ -3,12 +3,12 @@ Section: utils
Priority: optional
Maintainer: Sebastian Harl <tokkee@debian.org>
Uploaders: Marc Fournier <marc.fournier@camptocamp.com>
Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5),
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],
javahelper,
kfreebsd-kernel-headers [kfreebsd-any],
libatasmart-dev,
libatasmart-dev [linux-any],
libcap-dev [linux-any],
libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
libdbi0-dev,
......
......@@ -59,6 +59,7 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
--without-libstatgrab \
--without-included-ltdl \
--disable-static \
--disable-silent-rules \
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
......@@ -150,6 +151,11 @@ ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH)))
--disable-turbostat
endif
# libatasmart isn't available on these platforms.
ifneq (,$(filter hurd-i386 kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += --disable-smart
endif
# The hppa buildds currently do not keep up with Java related stuff, thus
# prevending testing transitions. sparc is also having trouble building the
# java plugin.
......@@ -202,7 +208,7 @@ clean:
install-indep:
dh_testdir
dh_testroot
dh_clean -k
dh_prep
dh_installdirs -i
dh_install -i
......@@ -220,7 +226,7 @@ install-indep:
install-arch: build
dh_testdir
dh_testroot
dh_clean -k
dh_prep
dh_installdirs -a
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
......@@ -277,9 +283,10 @@ binary-arch: build install-arch
dh_installdebconf -a
dh_systemd_enable -pcollectd-core --name=collectd collectd.service
dh_installinit -pcollectd-core --name=collectd -- defaults 95
dh_systemd_start
dh_systemd_start -pcollectd-core
dh_link -a
dh_strip -a --dbg-package=collectd-dbg
dh_strip_nondeterminism -pcollectd-core
dh_compress -a -Xexamples/
dh_fixperms -a
dh_makeshlibs -a
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment