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.


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: Beatles
diff -u myspell-3.0+pre3.1/debian/rules myspell-3.0+pre3.1/debian/rules
--- myspell-3.0+pre3.1/debian/rules
+++ myspell-3.0+pre3.1/debian/rules
@@ -62,7 +62,7 @@
        dh_install --sourcedir=debian/tmp
 
        mkdir -p debian/myspell-tools/usr/share/man/man1
-       pod2man debian/myspell-tools/usr/bin/ispellaff2myspell \
+       pod2man --utf8 debian/myspell-tools/usr/bin/ispellaff2myspell \
                > debian/myspell-tools/usr/share/man/man1/ispellaff2myspell.1
 
        for i in `dh_listpackages`; do \
diff -u myspell-3.0+pre3.1/debian/changelog myspell-3.0+pre3.1/debian/changelog
--- myspell-3.0+pre3.1/debian/changelog
+++ myspell-3.0+pre3.1/debian/changelog
@@ -1,3 +1,15 @@
+myspell (1:3.0+pre3.1-24.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "FTBFS: POD errors":
+    - update POD of ispellaff2myspell:
+      + convert to UTF-8 and add =encoding directive
+      + additionally fix a typo
+    - call pod2man with --utf8 in debian/rules
+    (Closes: #724085)
+
+ -- gregor herrmann <gre...@debian.org>  Fri, 08 Nov 2013 21:43:04 +0100
+
 myspell (1:3.0+pre3.1-24) unstable; urgency=low
 
   * remove historical hardocing of sparc-linux-gnu-g{cc,++} which breaks
diff -u myspell-3.0+pre3.1/debian/patches/03_add_ispellaff2myspell.dpatch 
myspell-3.0+pre3.1/debian/patches/03_add_ispellaff2myspell.dpatch
--- myspell-3.0+pre3.1/debian/patches/03_add_ispellaff2myspell.dpatch
+++ myspell-3.0+pre3.1/debian/patches/03_add_ispellaff2myspell.dpatch
@@ -23,10 +23,10 @@
 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-3.0+pre3.1~/utils/ispellaff2myspell 
myspell-3.0+pre3.1/utils/ispellaff2myspell
+--- myspell-3.0+pre3.1~/utils/ispellaff2myspell        1970-01-01 
01:00:00.000000000 +0100
++++ myspell-3.0+pre3.1/utils/ispellaff2myspell 2013-11-08 21:53:29.228190507 
+0100
+@@ -0,0 +1,474 @@
 +#!/usr/bin/perl -w
 +# -*- coding: iso-8859-1 -*-
 +#     $Id: ispellaff2myspell,v 1.29 2005/07/04 12:21:55 agmartin Exp $
@@ -127,24 +127,24 @@
 +      }
 +    } else {
 +      if ( $charset eq "latin0" ){
-+          $lowercase='a-z���������������������������������';
-+          $uppercase='A-Z�����������������������������޼��';
++          $lowercase='a-zàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ½¨¸';
++          $uppercase='A-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ¼¦´';
 +      } elsif ( $charset eq "latin1" ){
-+          $lowercase='a-z������������������������������';
-+          $uppercase='A-Z������������������������������';
++          $lowercase='a-zàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ';
++          $uppercase='A-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ';
 +      } elsif ( $charset eq "latin2" ){
-+          $lowercase='a-z����������������������������������������';
-+          $uppercase='A-Z����������������������������������������';
++          $lowercase='a-z±³µ¶¹º»¼¾¿àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ';
++          $uppercase='A-Z¡£¥¦©ª«¬®¯ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ';
 +      } elsif ( $charset eq "latin3" ){
-+          $lowercase='a-z������������������������������������';
-+          $uppercase='A-Z������������������������������������';
++          $lowercase='a-z±¶¹º»¼¿àáâäåæçèéêëìíîïñòóôõö÷øùúûüýþ';
++          $uppercase='A-Z¡¦©ª«¬¯ÀÁÂÄÅÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖרÙÚÛÜÝÞ';
 +#     } elsif ( $charset eq "other_charset" ){
 +#         die "latin2 still unimplemented";
 +      } else {
 +          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 +356,8 @@
 +
 +__END__
 +
++=encoding UTF-8
++
 +=head1 NAME
 +
 +B<ispellaff2myspell> - A program to convert ispell affix tables to myspell 
format.
@@ -431,8 +433,8 @@
 +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>      
 +
@@ -471,8 +473,8 @@
 +the two strings of lower and uppercase chars. Note that they must match 
 +exactly but case changed. It will look something like
 +
-+  $lowercase='a-z������������������������������';
-+  $uppercase='A-Z������������������������������';
++  $lowercase='a-zàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ';
++  $uppercase='A-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ';
 +
 +=head1 SEE ALSO
 +

Attachment: signature.asc
Description: Digital signature

Reply via email to