Upgrade to Encode 2.10

p4raw-id: //depot/perl@24490

6 files changed, 18 insertions, 10 deletions

diff --git a/ext/Encode/AUTHORS b/ext/Encode/AUTHORS
index 6b9513e8ff..42e2febfc0 100644
--- a/ext/Encode/AUTHORS
+++ b/ext/Encode/AUTHORS
@@ -25,7 +25,7 @@ Elizabeth Mattijsen             <liz@dijkmat.nl>
 Gerrit P. Haase			<gp@familiehaase.de>
 Graham Barr                     <gbarr@pobox.com>
 Gurusamy Sarathy		<gsar@activestate.com>
-H.Merijn Brand                  <h.m.brand@xs4all.nl>
+H.Merijn Brand                  <h.m.brand@hccnet.nl>
 Hugo van der Sanden		<hv@crypt.org>
 Inaba Hiroto			<inaba@st.rim.or.jp>
 Jarkko Hietaniemi		<jhi@iki.fi>
@@ -47,6 +47,7 @@ SUZUKI Norio                    <ZAP00217@nifty.com>
 Simon Cozens			<simon@netthink.co.uk>
 Spider Boardman			<spider@web.zk3.dec.com>
 Steve Hay			<steve.hay@uk.radan.com>
+Steve Peters			<steve@fisharerojo.org>
 Tatsuhiko Miyagawa		<miyagawa@edge.co.jp>
 Tels                            <perl_dummy@bloodgate.com>
 Vadim Konovalov			<vkonovalov@peterstar.ru>
diff --git a/ext/Encode/Changes b/ext/Encode/Changes
index 3dd1fce6e1..16d6ed2782 100644
--- a/ext/Encode/Changes
+++ b/ext/Encode/Changes
@@ -1,8 +1,16 @@
 # Revision history for Perl extension Encode.
 #
-# $Id: Changes,v 2.9 2004/12/03 19:16:53 dankogai Exp dankogai $
+# $Id: Changes,v 2.10 2005/05/16 18:46:36 dankogai Exp dankogai $
 #
-$Revision: 2.9 $ $Date: 2004/12/03 19:16:53 $
+$Revision: 2.10 $ $Date: 2005/05/16 18:46:36 $
+! Encode.pm
+  fixed decode_utf8() accordingly to RT#8872
+  http://rt.cpan.org/NoAuth/Bug.html?id=8872
+! Encode.xs AUTHORS
+  s/SvIVX/SvIV_set/ by Steve Peters.
+  Message-Id: <2297.67.96.185.36.1114626315.squirrel@webmail3.pair.com>
+! AUTHORS
+  GAAS was missing!
 ! Encode.pm
   New Pod section: "UTF-8 vs utf8"; explains utf-8-strict
 + t/utf8strict.t
diff --git a/ext/Encode/Encode.pm b/ext/Encode/Encode.pm
index 9ac98f9acf..079d1bd10b 100644
--- a/ext/Encode/Encode.pm
+++ b/ext/Encode/Encode.pm
@@ -1,10 +1,9 @@
 #
-# $Id: Encode.pm,v 2.9 2004/12/03 19:16:40 dankogai Exp $
+# $Id: Encode.pm,v 2.10 2005/05/16 18:46:36 dankogai Exp dankogai $
 #
 package Encode;
 use strict;
-# our $VERSION = do { my @r = (q$Revision: 2.9 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
-our $VERSION = '2.0902_01';
+our $VERSION = sprintf "%d.%02d", q$Revision: 2.10 $ =~ /(\d+)/g;
 sub DEBUG () { 0 }
 use XSLoader ();
 XSLoader::load(__PACKAGE__, $VERSION);
@@ -204,7 +203,7 @@ sub decode_utf8($;$)
     if ($check){
 	return decode("utf8", $str, $check);
     }else{
-	return undef unless utf8::decode($str);
+	return decode("utf8", $str);
 	return $str;
     }
 }
diff --git a/ext/Encode/Encode.xs b/ext/Encode/Encode.xs
index 2f907b6e64..689100b1e1 100644
--- a/ext/Encode/Encode.xs
+++ b/ext/Encode/Encode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Encode.xs,v 2.3 2004/12/03 19:16:53 dankogai Exp dankogai $
+ $Id: Encode.xs,v 2.4 2005/05/16 18:46:36 dankogai Exp dankogai $
  */
 
 #define PERL_NO_GET_CONTEXT
diff --git a/ext/Encode/META.yml b/ext/Encode/META.yml
index 3853ffad92..d1a3260ece 100644
--- a/ext/Encode/META.yml
+++ b/ext/Encode/META.yml
@@ -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:         Encode
-version:      2.0902
+version:      2.10
 version_from: Encode.pm
 installdirs:  perl
 requires:
diff --git a/ext/Encode/lib/Encode/Alias.pm b/ext/Encode/lib/Encode/Alias.pm
index f9bc3fe526..7776096271 100644
--- a/ext/Encode/lib/Encode/Alias.pm
+++ b/ext/Encode/lib/Encode/Alias.pm
@@ -2,7 +2,7 @@ package Encode::Alias;
 use strict;
 no warnings 'redefine';
 use Encode;
-our $VERSION = do { my @r = (q$Revision: 2.2 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+our $VERSION = do { my @r = (q$Revision: 2.3 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 sub DEBUG () { 0 }
 
 use base qw(Exporter);