r18571 - in /branches/upstream/libmime-charset-perl/current: Changes Charset.pm META.yml

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

Author: gregoa-guest
Date: Sun Apr 13 18:18:07 2008
New Revision: 18571

URL: http://svn.debian.org/wsvn/?sc=1&rev=18571
Log:
[svn-upgrade] Integrating new upstream version, libmime-charset-perl (1.006.1)

Modified:
    branches/upstream/libmime-charset-perl/current/Changes
    branches/upstream/libmime-charset-perl/current/Charset.pm
    branches/upstream/libmime-charset-perl/current/META.yml

Modified: branches/upstream/libmime-charset-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-charset-perl/current/Changes?rev=18571&op=diff
==============================================================================
--- branches/upstream/libmime-charset-perl/current/Changes (original)
+++ branches/upstream/libmime-charset-perl/current/Changes Sun Apr 13 18:18:07 2008
@@ -1,3 +1,7 @@
+2008-XX-XX	Hatuka*nezumi - IKEDA Soji	<hatuka at nezumi.nu>
+	* Release 1.0XX.
+	* Bug Fix: CPAN RT #34909: Test failures (fixed at 1.006.1).
+
 2008-04-12	Hatuka*nezumi - IKEDA Soji	<hatuka at nezumi.nu>
 	* Release 1.006.
 	* Workarounds for ``US-ASCII transformation'' charsets

Modified: branches/upstream/libmime-charset-perl/current/Charset.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-charset-perl/current/Charset.pm?rev=18571&op=diff
==============================================================================
--- branches/upstream/libmime-charset-perl/current/Charset.pm (original)
+++ branches/upstream/libmime-charset-perl/current/Charset.pm Sun Apr 13 18:18:07 2008
@@ -121,7 +121,7 @@
     }
 }
 
-$VERSION = '1.006';
+$VERSION = '1.006.1';
 
 ######## Private Attributes ########
 
@@ -364,6 +364,7 @@
     my $mapping = uc(shift);
     my ($spec, $name, $module, $encoder);
 
+    my $preserveerr = $@;
     foreach my $m (('EXTENDED', 'STANDARD')) {
 	next if $m eq 'EXTENDED' and $mapping ne 'EXTENDED';
 	$spec = $ENCODERS{$m}->{$charset};
@@ -374,10 +375,12 @@
 		eval "use $module;";
 		next if $@;
 	    }
+	    $@ = $preserveerr;
 	    $encoder = Encode::find_encoding($name);
 	    return $encoder if ref $encoder;
 	}
     }
+    $@ = $preserveerr;
     return Encode::find_encoding($charset);
 }
 

Modified: branches/upstream/libmime-charset-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-charset-perl/current/META.yml?rev=18571&op=diff
==============================================================================
--- branches/upstream/libmime-charset-perl/current/META.yml (original)
+++ branches/upstream/libmime-charset-perl/current/META.yml Sun Apr 13 18:18:07 2008
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         MIME-Charset
-version:      1.006
+version:      1.006.1
 version_from: Charset.pm
 installdirs:  site
 requires: