Bug#724085: myspell: FTBFS: POD errors

[Agustin Martin <agmartin@debian.org>]

On Fri, Nov 08, 2013 at 09:57:47PM +0100, gregor herrmann wrote:
> Control: tag -1 + patch
> 
> On Sun, 22 Sep 2013 20:55:32 +0200, David Suárez wrote:
> 
> > > pod2man debian/myspell-tools/usr/bin/ispellaff2myspell \
> > > 		> debian/myspell-tools/usr/share/man/man1/ispellaff2myspell.1
> > > debian/myspell-tools/usr/bin/ispellaff2myspell around line 445: Non-ASCII character seen before =encoding in '$lowercase='a-z??????????????????????????????';'. Assuming ISO8859-1
> > > POD document had syntax errors at /usr/bin/pod2man line 71.
> > > make: *** [install] Error 255
> 
> Hi Rene,
> 
> here's a patch that fixes this bug.

Hi, Rene and Gregor,

Please find attached the hunspell patch fixing this issue ported to myspell. 

Regards,

-- 
Agustin

diff --git a/debian/changelog b/debian/changelog
index b8546ca..f6270df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+myspell (1:3.0+pre3.1-25) unstable; urgency=low
+
+  [gregor herrmann]
+  * debian/patches/03_add_ispellaff2myspell.dpatch: Fix typo.
+
+  [Agustin Martin]
+  * debian/patches/03_add_ispellaff2myspell.dpatch:
+    - Declare encoding to fix "FTBFS: POD error" (Closes: #724085).
+    - Remove ancient CVS string.
+
+ --
+
 myspell (1:3.0+pre3.1-24) unstable; urgency=low
 
   * remove historical hardocing of sparc-linux-gnu-g{cc,++} which breaks
diff --git a/debian/patches/03_add_ispellaff2myspell.dpatch b/debian/patches/03_add_ispellaff2myspell.dpatch
old mode 100644
new mode 100755
index 0058d8b..d56922f
--- a/debian/patches/03_add_ispellaff2myspell.dpatch
+++ b/debian/patches/03_add_ispellaff2myspell.dpatch
@@ -23,13 +23,12 @@ esac
 exit 0
 
 @DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn /dev/null ./utils/ispellaff2myspell
---- /dev/null	1970-01-01 01:00:00.000000000 +0100
-+++ ./utils/ispellaff2myspell	2005-07-05 19:34:44.185649736 +0200
-@@ -0,0 +1,472 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' myspell~/utils/ispellaff2myspell myspell/utils/ispellaff2myspell
+--- myspell~/utils/ispellaff2myspell	1970-01-01 01:00:00.000000000 +0100
++++ myspell/utils/ispellaff2myspell	2013-11-12 18:11:56.000000000 +0100
+@@ -0,0 +1,473 @@
 +#!/usr/bin/perl -w
 +# -*- coding: iso-8859-1 -*-
-+# 	$Id: ispellaff2myspell,v 1.29 2005/07/04 12:21:55 agmartin Exp $
 +# 
 +#   (C) 2002-2005 Agustin Martin Domingo <agustin.martin@hispalinux.es> 
 +# 
@@ -144,7 +143,7 @@ diff -urNad --exclude=CVS --exclude=.svn /dev/null ./utils/ispellaff2myspell
 +	    if ( not $lowercase and not $uppercase ){
 +		die "Unsupported charset [$charset]
 +
-+use explicitely --lowercase=string and --uppercase=string
++use explicitly --lowercase=string and --uppercase=string
 +options. Remember that both string must match exactly, but 
 +case changed.
 +";
@@ -356,6 +355,8 @@ diff -urNad --exclude=CVS --exclude=.svn /dev/null ./utils/ispellaff2myspell
 +
 +__END__
 +
++=encoding ISO8859-1
++
 +=head1 NAME
 +
 +B<ispellaff2myspell> - A program to convert ispell affix tables to myspell format.
@@ -431,8 +432,8 @@ diff -urNad --exclude=CVS --exclude=.svn /dev/null ./utils/ispellaff2myspell
 +You will need a call to -e for each flag type, e.g., 
 +B<-e "\\\\" -e "~\\\\"> (or B<-e '\\' -e '~\\'>). 
 +
-+When a prefix is explicitely set, the default value (anything starting by B<\>) 
-+is disabled and you need to enable it explicitely as in previous example.
++When a prefix is explicitly set, the default value (anything starting by B<\>) 
++is disabled and you need to enable it explicitly as in previous example.
 +
 +=item B<--lowercase=s>      
 +