remove systemd and nondeterminism bits

diff --git a/debian/changelog b/debian/changelog
index d2c1f0d3a63690df6b55cb05769f299951a80d01..c5067645ebeddf95bde4261f72c59a9146ae90a2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 collectd (5.5.0-3ubuntu0~ppa14.04.1) trusty; urgency=medium
 
   * Rebuild for trusty PPA.
+  * debian/rules, debian/control:
+    - remove references to systemd and strip-nondeterminism, which aren't
+      available in trusty.
 
  -- Marc Fournier <marc@bl.uem.li>  Fri, 09 Oct 2015 22:33:04 +0200
 

diff --git a/debian/control b/debian/control
index f6982bd1703bf7a3cf897000e86850ef44eb687f..6e36bdfd007ffea65b72dc095b0cc48e6e508b7d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <tokkee@debian.org>
 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,
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf,
  bison, flex, autotools-dev, libltdl-dev, pkg-config,
  iptables-dev (>= 1.4.3.2-2) [linux-any],
  javahelper,

diff --git a/debian/rules b/debian/rules
index c245fe630ff1a8f6f34b0007425f0962700a2732..e22b2a86311bdd23845ba9495975c0022aa26748 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -281,13 +281,9 @@ 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
        dh_installinit -pcollectd-core --name=collectd -- defaults 95
-       dh_systemd_start -pcollectd-core
        dh_link -a
        dh_strip -a --dbg-package=collectd-dbg
-       # dh_strip_nondeterminism is broken atm; https://bugs.debian.org/799732
-       #dh_strip_nondeterminism -pcollectd-core
        dh_compress -a -Xexamples/
        dh_fixperms -a
        dh_makeshlibs -a