r11661 - in /trunk/liblocale-maketext-lexicon-perl/debian: changelog patches/02ignore_nonexistant.dpatch

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Wed Dec 26 00:17:29 2007
New Revision: 11661

URL: http://svn.debian.org/wsvn/?sc=1&rev=11661
Log:
Adapt patch 02ignore_nonexistant to new upstream code.

Modified:
    trunk/liblocale-maketext-lexicon-perl/debian/changelog
    trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch

Modified: trunk/liblocale-maketext-lexicon-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/changelog?rev=11661&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/changelog (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/changelog Wed Dec 26 00:17:29 2007
@@ -5,6 +5,7 @@
     field (source stanza); Homepage field (source stanza). Removed: XS-
     Vcs-Svn fields.
   * debian/watch: use dist-based URL.
+  * Adapt patch 02ignore_nonexistant to new upstream code.
 
  -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 09 Oct 2007 22:30:07 +0200
 

Modified: trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch
URL: http://svn.debian.org/wsvn/trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch?rev=11661&op=diff
==============================================================================
--- trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch (original)
+++ trunk/liblocale-maketext-lexicon-perl/debian/patches/02ignore_nonexistant.dpatch Wed Dec 26 00:17:29 2007
@@ -7,20 +7,20 @@
 ## DP: Thanks to Niko Tyni for the patch.
 
 @DPATCH@
-diff -urNad liblocale-maketext-lexicon-perl-0.61~/lib/Locale/Maketext/Lexicon.pm liblocale-maketext-lexicon-perl-0.61/lib/Locale/Maketext/Lexicon.pm
---- liblocale-maketext-lexicon-perl-0.61~/lib/Locale/Maketext/Lexicon.pm	2006-04-27 05:16:29.000000000 +0100
-+++ liblocale-maketext-lexicon-perl-0.61/lib/Locale/Maketext/Lexicon.pm	2006-06-08 14:26:25.000000000 +0100
-@@ -289,6 +289,7 @@
-             my @content = eval {
-                 $class->lexicon_get($src, scalar caller, $lang);
-             };
+diff -urNad liblocale-maketext-lexicon-perl~/lib/Locale/Maketext/Lexicon.pm liblocale-maketext-lexicon-perl/lib/Locale/Maketext/Lexicon.pm
+--- liblocale-maketext-lexicon-perl~/lib/Locale/Maketext/Lexicon.pm	2007-12-26 01:14:54.000000000 +0100
++++ liblocale-maketext-lexicon-perl/lib/Locale/Maketext/Lexicon.pm	2007-12-26 01:15:41.000000000 +0100
+@@ -298,6 +298,7 @@
+             local $@;
+             my @content =
+               eval { $class->lexicon_get( $src, scalar caller, $lang ); };
 +            chomp $@;
-             next if $@ and $@ eq 'next';
+             next if $@ and $@ =~ /^next\b/;
              die $@ if $@;
  
-@@ -468,7 +469,7 @@
-         map { File::Spec->catfile($_, @subpath, $src) } @INC;
-     } -1 .. $#path)[-1] unless -e $src;
+@@ -496,7 +497,7 @@
+       )[-1]
+       unless -e $src;
  
 -    defined $src or die 'next';
 +    defined $src or die "next\n";