[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#724085: Intent to NMU



Hi,

I've taken the patch prepared by Agustin Martin and prepared an NMU.  I'm not
sure why he didn't do it himself, but the patch has been sitting in the BTS for
more than 5 months now.

I'll be uploading to the 3-day delayed queue.

I'm attaching the diff here

-- 
Cheers,
Marga
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,13 @@
+myspell (1:3.0+pre3.1-24.1) unstable; urgency=medium
+
+  * Non-maintainer upload to fix FTBFS.
+  * Based on patches provided by gregor herrmann <gregoa@debian.org> and
+    Agustin Martin <agmartin@debian.org>.
+  * Fix typo and encoding in debian/patches/03_add_ispellaff2myspell.dpatch
+    (Closes: #724085).
+
+ -- Margarita Manterola <marga@debian.org>  Fri, 25 Apr 2014 18:45:29 +0200
+
 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,13 +23,12 @@
 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	2014-04-25 18:59:59.658771225 +0200
+@@ -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 @@
 +	    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 @@
 +
 +__END__
 +
++=encoding ISO8859-1
++
 +=head1 NAME
 +
 +B<ispellaff2myspell> - A program to convert ispell affix tables to myspell format.
@@ -431,8 +432,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>      
 +

Reply to: