From: Sebastian Harl <sh@tokkee.org>
Date: Wed, 25 Apr 2007 14:05:17 +0000 (+0200)
Subject: Added extractDS_path.dpatch to set the path to /usr/lib/collectd/utils/.
X-Git-Tag: collectd-4.0.2-1~65
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e567c85970a0d2a36e4838e70aeca3e9a12e6ff8;p=pkg-collectd.git

Added extractDS_path.dpatch to set the path to /usr/lib/collectd/utils/.
---

diff --git a/debian/control b/debian/control
index e14ee37..423f3fa 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: collectd
 Section: utils
 Priority: optional
 Maintainer: Sebastian Harl <sh@tokkee.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap-dev, iptables-dev [!amd64 !ia64 !ppc64], nut-dev [!amd64 !ia64 !ppc64], libperl-dev
+Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap-dev, iptables-dev [!amd64 !ia64 !ppc64], nut-dev [!amd64 !ia64 !ppc64], libperl-dev
 Build-Conflicts: libpthread-dev
 Standards-Version: 3.7.2
 
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..0d82f45
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1,2 @@
+extractDS_path.dpatch
+
diff --git a/debian/patches/extractDS_path.dpatch b/debian/patches/extractDS_path.dpatch
new file mode 100755
index 0000000..e8395c5
--- /dev/null
+++ b/debian/patches/extractDS_path.dpatch
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## extractDS_path.dpatch by Sebastian Harl <sh@tokkee.org>
+##
+## DP: Set the path of extractDS.px to /usr/lib/collectd/utils/.
+
+@DPATCH@
+
+diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
+--- a/contrib/migrate-3-4.px
++++ b/contrib/migrate-3-4.px
+@@ -166,7 +166,7 @@ for (@Files)
+ 			my $src_ds = $src_dses->[$i];
+ 			$dest->{'type_instance'} = $type_instances->[$i];
+ 			$dest_filename = get_filename ($dest);
+-			print "./extractDS.px -i '$InDir/$orig_filename' -s '$src_ds' -o '$OutDir/$dest_filename' -d '$dst_ds'\n";
++			print "/usr/lib/collectd/utils/extractDS.px -i '$InDir/$orig_filename' -s '$src_ds' -o '$OutDir/$dest_filename' -d '$dst_ds'\n";
+ 		}
+ 	}
+ 	elsif (exists ($TypeRename{$orig->{'type'}}))
diff --git a/debian/rules b/debian/rules
index 385a28c..bfe0592 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,8 @@ else
 	CFLAGS += -O2
 endif
 
+include /usr/share/dpatch/dpatch.make
+
 confflags = --host=$(DEB_HOST_GNU_TYPE) \
 			--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
@@ -32,7 +34,7 @@ ifneq (,$(findstring $(DEB_BUILD_ARCH),amd64 ia64 ppc64))
 	confflags += --disable-iptables --disable-nut
 endif
 
-config.status: configure
+config.status: configure $(DPATCH_STAMPFN)
 	dh_testdir
 	CFLAGS="$(CFLAGS)" ./configure $(confflags)
 
@@ -45,7 +47,7 @@ build-stamp: config.status
 	
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp