From: Sebastian Harl Date: Fri, 21 Aug 2015 11:19:53 +0000 (+0200) Subject: Convert the package to "3.0 (quilt)" format. X-Git-Tag: collectd-5.5.0-1~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=91960c843a1b3561ef511c0a4907abe2efec3fa6;p=pkg-collectd.git Convert the package to "3.0 (quilt)" format. * Build-depend on debhelper (>= 7.0.50~) and drop dpatch. * Renamed patch files from *.dpatch to *.patch and drop the dpatch header. * Changed debian/patches/00list to debian/patches/series. * Drop all patch operations from debian/rules. Thanks to YunQiang Su for an initial patch. Closes: #688719 --- diff --git a/debian/changelog b/debian/changelog index f93abcf..beb9e8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,12 @@ collectd (5.5.0-1) UNRELEASED; urgency=medium * debian/po: - Update Dutch debconf template translation; thanks to Frans Spiesschaert (Closes: #763783). + * Convert the package to "3.0 (quilt)" format; thanks to YunQiang Su for an + initial patch (Closes: #688719): + - Build-depend on debhelper (>= 7.0.50~) and drop dpatch. + - Renamed patch files from *.dpatch to *.patch and drop the dpatch header. + - Changed debian/patches/00list to debian/patches/series. + - Drop all patch operations from debian/rules. -- Marc Fournier Tue, 30 Jun 2015 07:08:39 +0200 diff --git a/debian/control b/debian/control index 5f6572c..1f124e6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Sebastian Harl Uploaders: Marc Fournier -Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, dh-systemd (>= 1.5), +Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-systemd (>= 1.5), bison, flex, autotools-dev, libltdl-dev, pkg-config, iptables-dev (>= 1.4.3.2-2) [linux-any], javahelper, diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index c40ff1a..0000000 --- a/debian/patches/00list +++ /dev/null @@ -1,3 +0,0 @@ -rrd_filter_path.dpatch -collection_conf_path.dpatch -myplugin_includes.dpatch diff --git a/debian/patches/collection_conf_path.dpatch b/debian/patches/collection_conf_path.dpatch deleted file mode 100755 index f4ca8e9..0000000 --- a/debian/patches/collection_conf_path.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## collection_conf_path.dpatch by Sebastian Harl -## -## DP: Set the path of collection.conf to /etc/collectd/. - -@DPATCH@ - -diff a/contrib/collection.cgi b/contrib/collection.cgi ---- a/contrib/collection.cgi -+++ b/contrib/collection.cgi -@@ -11,7 +11,7 @@ use URI::Escape ('uri_escape'); - use RRDs (); - use Data::Dumper (); - --our $Config = "/etc/collection.conf"; -+our $Config = "/etc/collectd/collection.conf"; - our @DataDirs = (); - our $LibDir; - diff --git a/debian/patches/collection_conf_path.patch b/debian/patches/collection_conf_path.patch new file mode 100644 index 0000000..76c8fec --- /dev/null +++ b/debian/patches/collection_conf_path.patch @@ -0,0 +1,13 @@ +Author: Sebastian Harl +Description: Set the path of collection.conf to /etc/collectd/. +--- a/contrib/collection.cgi ++++ b/contrib/collection.cgi +@@ -32,7 +32,7 @@ + use RRDs (); + use Data::Dumper (); + +-our $Config = "/etc/collection.conf"; ++our $Config = "/etc/collectd/collection.conf"; + our @DataDirs = (); + our @DontShowTypes = (); + our $LibDir; diff --git a/debian/patches/myplugin_includes.dpatch b/debian/patches/myplugin_includes.dpatch deleted file mode 100755 index fdcbde8..0000000 --- a/debian/patches/myplugin_includes.dpatch +++ /dev/null @@ -1,24 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## myplugin_includes.dpatch by Sebastian Harl -## -## DP: Let the example plugin include the core headers from -## DP: /usr/include/collectd/core. - -@DPATCH@ - -diff a/contrib/examples/myplugin.c b/contrib/examples/myplugin.c ---- a/contrib/examples/myplugin.c -+++ b/contrib/examples/myplugin.c -@@ -38,9 +38,9 @@ - - #endif /* ! HAVE_CONFIG */ - --#include --#include --#include -+#include -+#include -+#include - - /* - * data source definition: diff --git a/debian/patches/myplugin_includes.patch b/debian/patches/myplugin_includes.patch new file mode 100644 index 0000000..9b8b04d --- /dev/null +++ b/debian/patches/myplugin_includes.patch @@ -0,0 +1,18 @@ +Author: Sebastian Harl +Description: Let the example plugin include the core headers from +/usr/include/collectd/core. +--- a/contrib/examples/myplugin.c ++++ b/contrib/examples/myplugin.c +@@ -38,9 +38,9 @@ + + #endif /* ! HAVE_CONFIG */ + +-#include +-#include +-#include ++#include ++#include ++#include + + /* + * data source definition: diff --git a/debian/patches/rrd_filter_path.dpatch b/debian/patches/rrd_filter_path.dpatch deleted file mode 100755 index 4580bba..0000000 --- a/debian/patches/rrd_filter_path.dpatch +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## rrd_filter_path.dpatch by Sebastian Harl -## -## DP: Set the path of rrd_filter.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 "./rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n"; -+ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n"; - } - } - elsif (exists ($TypeRename{$orig->{'type'}})) -@@ -361,19 +361,19 @@ sub special_disk - $OutDirs{$dest_directory} = 1; - } - -- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n"; -+ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n"; - - $dest->{'type'} = 'disk_octets'; - $dest_filename = get_filename ($dest); -- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n"; -+ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n"; - - $dest->{'type'} = 'disk_ops'; - $dest_filename = get_filename ($dest); -- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n"; -+ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n"; - - $dest->{'type'} = 'disk_time'; - $dest_filename = get_filename ($dest); -- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n"; -+ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n"; - } - - sub exit_usage -diff a/contrib/migrate-4-5.px b/contrib/migrate-4-5.px ---- a/contrib/migrate-4-5.px -+++ b/contrib/migrate-4-5.px -@@ -32,8 +32,8 @@ - use File::Basename ('dirname'); - - our $InDir = '/var/lib/collectd'; --our $RRDtool = 'rrdtool'; --our $RRDFilter = 'rrd_filter.px'; -+our $RRDtool = '/usr/bin/rrdtool'; -+our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px'; - - our %TypesCounterToDerive = # {{{ - ( diff --git a/debian/patches/rrd_filter_path.patch b/debian/patches/rrd_filter_path.patch new file mode 100644 index 0000000..060fec7 --- /dev/null +++ b/debian/patches/rrd_filter_path.patch @@ -0,0 +1,50 @@ +Author: Sebastian Harl +Description: Set the path of rrd_filter.px to /usr/lib/collectd/utils/. +--- a/contrib/migrate-3-4.px ++++ b/contrib/migrate-3-4.px +@@ -167,7 +167,7 @@ + my $src_ds = $src_dses->[$i]; + $dest->{'type_instance'} = $type_instances->[$i]; + $dest_filename = get_filename ($dest); +- print "./rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n"; ++ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m '${src_ds}:${dst_ds}' -o '$OutDir/$dest_filename'\n"; + } + } + else +@@ -363,19 +363,19 @@ + $OutDirs{$dest_directory} = 1; + } + +- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n"; ++ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rmerged:read' -m 'wmerged:write' -o '$OutDir/$dest_filename'\n"; + + $dest->{'type'} = 'disk_octets'; + $dest_filename = get_filename ($dest); +- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n"; ++ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rbytes:read' -m 'wbytes:write' -o '$OutDir/$dest_filename'\n"; + + $dest->{'type'} = 'disk_ops'; + $dest_filename = get_filename ($dest); +- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n"; ++ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rcount:read' -m 'wcount:write' -o '$OutDir/$dest_filename'\n"; + + $dest->{'type'} = 'disk_time'; + $dest_filename = get_filename ($dest); +- print "./rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n"; ++ print "/usr/lib/collectd/utils/rrd_filter.px -i '$InDir/$orig_filename' -m 'rtime:read' -m 'wtime:write' -o '$OutDir/$dest_filename'\n"; + } + + sub exit_usage +--- a/contrib/migrate-4-5.px ++++ b/contrib/migrate-4-5.px +@@ -32,8 +32,8 @@ + use File::Basename ('dirname'); + + our $InDir = '/var/lib/collectd'; +-our $RRDtool = 'rrdtool'; +-our $RRDFilter = 'rrd_filter.px'; ++our $RRDtool = '/usr/bin/rrdtool'; ++our $RRDFilter = '/usr/lib/collectd/utils/rrd_filter.px'; + + our %TypesCounterToDerive = # {{{ + ( diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..5e9e15a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +rrd_filter_path.patch +collection_conf_path.patch +myplugin_includes.patch diff --git a/debian/rules b/debian/rules index c38d9af..aab7db9 100755 --- a/debian/rules +++ b/debian/rules @@ -51,8 +51,6 @@ 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 \ @@ -153,15 +151,9 @@ 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/' \ @@ -186,7 +178,7 @@ build-stamp: config.status touch build-stamp -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt)