summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 740ed10)
raw | patch | inline | side by side (parent: 740ed10)
author | Sebastian Harl <sh@tokkee.org> | |
Sun, 7 Dec 2008 17:21:11 +0000 (18:21 +0100) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Sun, 7 Dec 2008 17:21:11 +0000 (18:21 +0100) |
This patch has been included upstream.
debian/changelog | patch | blob | history | |
debian/patches/00list | patch | blob | history | |
debian/patches/pod-errors.dpatch | [deleted file] | patch | blob | history |
diff --git a/debian/changelog b/debian/changelog
index 8f7072a42ad5fb7f93b9b21a2cef7851e60bde9b..fb119accf976483445c4aed4daaf2203f3740b5d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
- Removed snmp_memleak.dpatch - included upstream.
- Removed memcached_fdleak.dpatch - included upstream.
- Removed memcached_timeout.dpatch - included upstream.
+ - Removed pod-errors.dpatch - included upstream.
* debian/collectd.overrides:
- Override "spelling-error-in-description" for the postgresql plugin name
all plugins are spelled lowercase.
- -- Sebastian Harl <sh@tokkee.org> Mon, 01 Dec 2008 21:41:12 +0100
+ -- Sebastian Harl <sh@tokkee.org> Sun, 07 Dec 2008 18:20:41 +0100
collectd (4.4.2-3) unstable; urgency=low
diff --git a/debian/patches/00list b/debian/patches/00list
index 87f910c2d33e19ba6596d8f9fdef15844ff345d1..12d1fc0f24ed08f51f27a9d18c8ab20e136843d5 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
rrd_filter_path.dpatch
collection_conf_path.dpatch
perl-uninitialized-var.dpatch
-pod-errors.dpatch
diff --git a/debian/patches/pod-errors.dpatch b/debian/patches/pod-errors.dpatch
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pod-errors.dpatch by Sebastian Harl <sh@tokkee.org>
-##
-## DP: collectd(1), collectd{-exec,.conf}(5): Fixed some minor POD errors.
-
-@DPATCH@
-
-diff a/src/collectd-exec.pod b/src/collectd-exec.pod
---- a/src/collectd-exec.pod
-+++ b/src/collectd-exec.pod
-@@ -171,11 +171,13 @@ table. All the options are optional, but B<plugin_instance> without B<plugin>
- or B<type_instance> without B<type> doesn't make much sense and should be
- avoided.
-
--Please note that this is the same format as used in the B<unixsock plugin>, see
--L<collectd-unixsock(5)>.
-+=back
-
- =back
-
-+Please note that this is the same format as used in the B<unixsock plugin>, see
-+L<collectd-unixsock(5)>.
-+
- When collectd exits it sends a B<SIGTERM> to all still running
- child-processes upon which they have to quit.
-
-diff a/src/collectd.conf.pod b/src/collectd.conf.pod
---- a/src/collectd.conf.pod
-+++ b/src/collectd.conf.pod
-@@ -1323,6 +1323,8 @@ This option, although numeric, needs to be a string, i.E<nbsp>e. you B<must>
- use quotes around it! If no such statement is given only global information
- will be collected.
-
-+=back
-+
- =head2 Plugin C<tcpconns>
-
- The C<tcpconns plugin> counts the number of currently established TCP
-@@ -1333,8 +1335,6 @@ fine-tune the ports you are interested in:
-
- =over 4
-
--=back
--
- =item B<ListeningPorts> I<true>|I<false>
-
- If this option is set to I<true>, statistics for all local ports for which a
-diff a/src/collectd.pod b/src/collectd.pod
---- a/src/collectd.pod
-+++ b/src/collectd.pod
-@@ -116,6 +116,8 @@ internal caches. E.E<nbsp>g. the C<rrdtool plugin> will write all pending data
- to the RRD files. This is the same as using the C<FLUSH -1> command of the
- C<unixsock plugin>.
-
-+=back
-+
- =head1 SEE ALSO
-
- L<collectd.conf(5)>,