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

Preparing for 5.5.0-3

diff --git a/debian/changelog b/debian/changelog
index de164efc4b87f8c5bacb95c7f309c0ab0ceac41f..60835f5d4c6809daab4b07864c720b101ef95b13 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+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:

diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides
index 0d46c240d4aa08ab21d59d9ae646f5170ef50b76..6caf9536700ef2077f2e8b318485dcda647a8220 100644 (file)
--- a/debian/collectd-core.overrides
+++ b/debian/collectd-core.overrides
@@ -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
 

diff --git a/debian/control b/debian/control
index 1f124e6e9aa395ddaea3fe52bdcab3acdb248285..f89a0c8a4f2e758c5095d4e3a37031e13c772cb7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -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,

diff --git a/debian/rules b/debian/rules
index 229a9be05aeb8e1bccc0b0ec6696ad6ddfce6384..3960dff718620145034dd2c1062d89703aa81d33 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -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