Commit 91960c84 authored by Sebastian Harl's avatar Sebastian Harl

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
parent 73661c3c
......@@ -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 <marc.fournier@camptocamp.com> Tue, 30 Jun 2015 07:08:39 +0200
......
......@@ -3,7 +3,7 @@ Section: utils
Priority: optional
Maintainer: Sebastian Harl <tokkee@debian.org>
Uploaders: Marc Fournier <marc.fournier@camptocamp.com>
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,
......
rrd_filter_path.dpatch
collection_conf_path.dpatch
myplugin_includes.dpatch
#! /bin/sh /usr/share/dpatch/dpatch-run
## collection_conf_path.dpatch by Sebastian Harl <sh@tokkee.org>
##
## DP: Set the path of collection.conf to /etc/collectd/.
@DPATCH@
diff a/contrib/collection.cgi b/contrib/collection.cgi
Author: Sebastian Harl <sh@tokkee.org>
Description: Set the path of collection.conf to /etc/collectd/.
--- a/contrib/collection.cgi
+++ b/contrib/collection.cgi
@@ -11,7 +11,7 @@ use URI::Escape ('uri_escape');
@@ -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;
#! /bin/sh /usr/share/dpatch/dpatch-run
## myplugin_includes.dpatch by Sebastian Harl <sh@tokkee.org>
##
## 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
Author: Sebastian Harl <sh@tokkee.org>
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 @@
......
#! /bin/sh /usr/share/dpatch/dpatch-run
## rrd_filter_path.dpatch by Sebastian Harl <sh@tokkee.org>
##
## 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
Author: Sebastian Harl <sh@tokkee.org>
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
@@ -166,7 +166,7 @@ for (@Files)
@@ -167,7 +167,7 @@
my $src_ds = $src_dses->[$i];
$dest->{'type_instance'} = $type_instances->[$i];
$dest_filename = get_filename ($dest);
......@@ -16,8 +10,8 @@ diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
+ 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
else
@@ -363,19 +363,19 @@
$OutDirs{$dest_directory} = 1;
}
......@@ -41,7 +35,6 @@ diff a/contrib/migrate-3-4.px b/contrib/migrate-3-4.px
}
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 @@
......
rrd_filter_path.patch
collection_conf_path.patch
myplugin_includes.patch
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment