X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=aab7db998ca552109936748cbd164bf1756d0dae;hb=9e9a8d617a8b29c6bc8700885e2cd15d8b71e8f1;hp=6b8b6d2e77e1fef3bbc241caef80087bfb773181;hpb=144d778b1074fd0f1a680b0d64a547a699c8f067;p=pkg-collectd.git

diff --git a/debian/rules b/debian/rules
index 6b8b6d2..aab7db9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,12 @@ CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
 CPPFLAGS += -UCONFIGFILE
 CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"'
 
+# A PostgreSQL header redefines CACHE_LINE_SIZE on FreeBSD.
+# Cf. https://bugs.debian.org/760719 and https://bugs.debian.org/763098
+ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+	CPPFLAGS += -Wp,-w
+endif
+
 LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
 
 # The archdir map has been copied from openjdk-6's debian/rules.
@@ -45,13 +51,11 @@ JAR = $(JAVA_HOME)/bin/jar
 JAVA_CPPFLAGS = -I$(JAVA_HOME)/include
 JAVA_LDFLAGS = -L$(JAVA_LIBDIR) -Wl,-rpath -Wl,$(JAVA_LIBDIR)
 
-include /usr/share/dpatch/dpatch.make
-
 confflags = --host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--localstatedir=/var --sysconfdir=/etc \
-			--with-perl-bindings="INSTALLDIRS=vendor" \
+			--with-perl-bindings="INSTALLDIRS=vendor INSTALL_BASE=" \
 			--without-libstatgrab \
 			--without-included-ltdl \
 			--disable-static \
@@ -74,30 +78,18 @@ confflags += --disable-mic
 # libnetapp is required for the netapp plugin.
 confflags += --disable-netapp
 
-# libowcapi is required for the onewire plugin.
-confflags += --disable-onewire
-
 # libclntsh is required for the oracle plugin.
 confflags += --disable-oracle
 
-# libcredis is required for the *redis plugins.
-confflags += --disable-redis --disable-write_redis
-
 # librouteros is required for the routeros plugin.
 confflags += --disable-routeros
 
-# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
-confflags += --disable-sigrok
-
 # libmongoc is required for the write_mongodb plugin.
 confflags += --disable-write_mongodb
 
 # xmms1 is required for the xmms plugin.
 confflags += --disable-xmms
 
-# libkstat is required for the xfs_arc plugin.
-confflags += --disable-zfs-arc
-
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += \
@@ -147,26 +139,21 @@ endif
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += \
 		--disable-gmond \
-		--disable-libvirt \
+		--disable-virt \
 		--disable-tokyotyrant \
 		--disable-java
 endif
 
 # The hppa buildds currently do not keep up with Java related stuff, thus
-# prevending testing transitions.
-ifneq (,$(filter hppa, $(DEB_BUILD_ARCH)))
+# prevending testing transitions. sparc is also having trouble building the
+# java plugin.
+ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH)))
 	confflags += --disable-java
 endif
 
-config.status: configure $(DPATCH_STAMPFN)
+config.status: configure
 	dh_testdir
 	
-	( cd debian/patches/; for patch in *; do \
-		if test "$$patch" != "00list"; then \
-			grep "$$patch" 00list > /dev/null \
-				|| ( echo "$$patch not enabled\!"; exit 1 ); \
-		fi; done )
-	
 	# This is a work-around for #474087 (broken openipmi .pc files).
 	mkdir debian/pkgconfig
 	sed -re 's/^(Requires:.*) pthread(.*)$$/\1\2/' \
@@ -191,7 +178,7 @@ build-stamp: config.status
 	
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -212,6 +199,17 @@ install-indep:
 	dh_clean -k
 	dh_installdirs -i
 	dh_install -i
+	
+	# update include path for collectd header files
+	(	set -e; \
+		cd $(CURDIR)/debian/collectd-dev/usr/include/collectd/; \
+		for lib in $$(find . -type f -name '*.h'); do \
+			libname=$$(basename $$lib); \
+			fullpath=$$(echo $$lib | sed -r -e 's,^\./,collectd/,'); \
+			for dir in $$(find . -mindepth 1 -type d); do \
+				sed -r -i -e "s,(include\s+)\".*$$libname\",\1\"$$fullpath\"," $$dir/*.h; \
+			done; \
+		done )
 
 install-arch: build
 	dh_testdir
@@ -271,7 +269,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 collectd.service
 	dh_installinit -pcollectd-core --name=collectd -- defaults 95
+	dh_systemd_start
 	dh_link -a
 	dh_strip -a --dbg-package=collectd-dbg
 	dh_compress -a -Xexamples/