Control: tag -1 + patch

On Sat, 18 May 2013 02:10:01 +0100, Dominic Hargreaves wrote:

> $ pod2man --release=5.1.0 --center=collectd collectdctl.pod > /dev/null
> collectdctl.pod around line 157: Non-ASCII character seen before =encoding in 
> 'H�kon'. Assuming ISO8859-1
> POD document had syntax errors at 
> /home/dom/perl5/perlbrew/perls/perl-5.17.10/bin/pod2man line 71.
> 
> There are several of these to be fixed - at least collectd.conf.5 and
> collectd-java.5.

Patch attached that adds the =encoding to the three .pod files.


Cheers,
gregor 

-- 
 .''`.  Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
 : :' : Debian GNU/Linux user, admin, and developer  -  http://www.debian.org/
 `. `'  Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe
   `-   NP: Rolling Stones: Brown Sugar
diff -u collectd-5.1.0/debian/changelog collectd-5.1.0/debian/changelog
--- collectd-5.1.0/debian/changelog
+++ collectd-5.1.0/debian/changelog
@@ -1,3 +1,12 @@
+collectd (5.1.0-3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS with perl 5.18: POD errors":
+    add patch pod-perl-5.18 that adds =encoding to some POD files.
+    (Closes: #708718)
+
+ -- gregor herrmann <[email protected]>  Sun, 19 May 2013 15:46:55 +0200
+
 collectd (5.1.0-3) unstable; urgency=low
 
   * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst:
diff -u collectd-5.1.0/debian/patches/00list collectd-5.1.0/debian/patches/00list
--- collectd-5.1.0/debian/patches/00list
+++ collectd-5.1.0/debian/patches/00list
@@ -5,0 +6 @@
+pod-perl-5.18.dpatch
only in patch2:
unchanged:
--- collectd-5.1.0.orig/debian/patches/pod-perl-5.18.dpatch
+++ collectd-5.1.0/debian/patches/pod-perl-5.18.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pod-perl-5.18.dpatch by gregor herrmann <[email protected]>
+##
+# 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 <[email protected]>
+# 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

Attachment: signature.asc
Description: Digital signature

Reply via email to