patches/: Removed pod-perl-5.18.dpatch; applied upstream.

diff --git a/debian/changelog b/debian/changelog
index 2c000b35e28de1b4529c164732c17ce3a997af24..e9d4666852ba07721c8a760e14fcd4cb14cd55e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ collectd (5.4.0-1) UNRELEASED; urgency=low
     - aggregate values received with the StatsD protocol: statsd
     - incremental parsing of CSV files: tail_csv
     - send collected values to Riemann: write_riemann
+  * debian/patches:
+    - Removed pod-perl-5.18.dpatch; applied upstream.
   * debian/control, debian/rules:
     - Depend on libmnl-dev and enable the netlink plugin on all architectures
       (upstream removed the dependency on the netlink library which is only

diff --git a/debian/patches/00list b/debian/patches/00list
index 5a851be66aad4567499813be8a955a92f1ec9c14..23aacf62e043c084fffcce668440b01881337668 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,4 +2,3 @@ rrd_filter_path.dpatch
 collection_conf_path.dpatch
 myplugin_includes.dpatch
 bts559801_plugin_find_fix.dpatch
-pod-perl-5.18.dpatch

diff --git a/debian/patches/pod-perl-5.18.dpatch b/debian/patches/pod-perl-5.18.dpatch
deleted file mode 100644 (file)
index be07870..0000000
--- a/debian/patches/pod-perl-5.18.dpatch
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## pod-perl-5.18.dpatch by gregor herrmann <gregoa@debian.org>
-##
-# Description: add =encoding to POD. perl 5.18 is more picky and exists with an error.
-# Origin: vendor
-# Bug-Debian: http://bugs.debian.org/708718
-# Forwarded: no
-# Author: gregor herrmann <gregoa@debian.org>
-# Last-Update: 2013-05-19
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-5.1.0~/src/collectd-java.pod collectd-5.1.0/src/collectd-java.pod
---- collectd-5.1.0~/src/collectd-java.pod      2012-04-02 10:04:58.000000000 +0200
-+++ collectd-5.1.0/src/collectd-java.pod       2013-05-19 16:18:19.323246574 +0200
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
- 
- collectd-java - Documentation of collectd's "java plugin"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-5.1.0~/src/collectd.conf.pod collectd-5.1.0/src/collectd.conf.pod
---- collectd-5.1.0~/src/collectd.conf.pod      2012-04-02 10:04:58.000000000 +0200
-+++ collectd-5.1.0/src/collectd.conf.pod       2013-05-19 16:17:52.395246170 +0200
-@@ -1,3 +1,5 @@
-+=encoding utf8
-+
- =head1 NAME
- 
- collectd.conf - Configuration for the system statistics collection daemon B<collectd>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-5.1.0~/src/collectdctl.pod collectd-5.1.0/src/collectdctl.pod
---- collectd-5.1.0~/src/collectdctl.pod        2012-04-02 10:04:58.000000000 +0200
-+++ collectd-5.1.0/src/collectdctl.pod 2013-05-19 16:18:04.251246348 +0200
-@@ -1,3 +1,5 @@
-+=encoding latin1
-+
- =head1 NAME
- 
- collectdctl - Control interface for collectd