r18656 - in /trunk/libmime-encwords-perl: Changes EncWords.pm META.yml Makefile.PL debian/changelog t/02encode.t

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

Author: gregoa-guest
Date: Wed Apr 16 14:44:22 2008
New Revision: 18656

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=18656
Log:
New upstream release.

Modified:
    trunk/libmime-encwords-perl/Changes
    trunk/libmime-encwords-perl/EncWords.pm
    trunk/libmime-encwords-perl/META.yml
    trunk/libmime-encwords-perl/Makefile.PL
    trunk/libmime-encwords-perl/debian/changelog
    trunk/libmime-encwords-perl/t/02encode.t

Modified: trunk/libmime-encwords-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-encwords-perl/Changes?rev=18656&op=diff
==============================================================================
--- trunk/libmime-encwords-perl/Changes (original)
+++ trunk/libmime-encwords-perl/Changes Wed Apr 16 14:44:22 2008
@@ -1,3 +1,11 @@
+2008-XX-XX	Hatuka*nezumi - IKEDA Soji	<hatuka at nezumi.nu>
+
+	* Release 1.0XX.
+	* Perl >= 5.8.1: Requires MIME::Charset 1.006.1.
+	* Perl >= 5.11.0: Suppress ``Use of uninitialized value
+	  within @_ in lc'' warnings.
+	* Improved ``ASCII transformation'' workaround (still buggy).
+
 2008-04-12	Hatuka*nezumi - IKEDA Soji	<hatuka at nezumi.nu>
 
 	* Release 1.010.

Modified: trunk/libmime-encwords-perl/EncWords.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-encwords-perl/EncWords.pm?rev=18656&op=diff
==============================================================================
--- trunk/libmime-encwords-perl/EncWords.pm (original)
+++ trunk/libmime-encwords-perl/EncWords.pm Wed Apr 16 14:44:22 2008
@@ -120,7 +120,7 @@
 #------------------------------
 
 ### The package version, both in 1.23 style *and* usable by MakeMaker:
-$VERSION = '1.010';
+$VERSION = '1.010.10';
 
 ### Public Configuration Attributes
 $Config = {
@@ -336,7 +336,7 @@
 	    }
 
 	    if (scalar(@tokens) and
-		lc($charset) eq lc($tokens[-1]->[1]) and
+		lc($charset || "") eq lc($tokens[-1]->[1] || "") and
 		resolve_alias($charset) and
 		(!${tokens[-1]}[2] and !$language or
 		 lc(${tokens[-1]}[2]) eq lc($language))) { # Concat words if possible.
@@ -695,13 +695,15 @@
 
 		# workaround for ``ASCII transformation'' charsets
 		my $u = $w;
-		if ($charsetobj->as_string =~ /$ASCIITRANS/ and $u =~ /[+~]/) {
-		    if ($charsetobj->decoder) {
-			$u = $charsetobj->decode($u);
-		    } elsif (!MIME::Charset::USE_ENCODE) { # for pre-Encode env.
-			$u = "X$u";
-		    } else { # NOTREACHED
-			croak __PACKAGE__.": Bug in encode_mimewords";
+		if ($charsetobj->as_string =~ /$ASCIITRANS/) {
+		    if (MIME::Charset::USE_ENCODE) {
+			if (is_utf8($w) or $w =~ /$WIDECHAR/) {
+			    $w = $charsetobj->undecode($u);
+			} else {
+			    $u = $charsetobj->decode($w);
+			}
+		    } elsif ($w =~ /[+~]/) { #FIXME: for pre-Encode environment
+		        $u = "x$w";
 		    }
 		}
 		if (scalar(@words)) {

Modified: trunk/libmime-encwords-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-encwords-perl/META.yml?rev=18656&op=diff
==============================================================================
--- trunk/libmime-encwords-perl/META.yml (original)
+++ trunk/libmime-encwords-perl/META.yml Wed Apr 16 14:44:22 2008
@@ -1,13 +1,13 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         MIME-EncWords
-version:      1.010
+version:      1.010.10
 version_from: EncWords.pm
 installdirs:  site
 requires:
     Encode:                        1.98
     MIME::Base64:                  2.13
-    MIME::Charset:                 1.006
+    MIME::Charset:                 1.006.1
     Test:                          0
 
 distribution_type: module

Modified: trunk/libmime-encwords-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-encwords-perl/Makefile.PL?rev=18656&op=diff
==============================================================================
--- trunk/libmime-encwords-perl/Makefile.PL (original)
+++ trunk/libmime-encwords-perl/Makefile.PL Wed Apr 16 14:44:22 2008
@@ -6,11 +6,11 @@
 	'VERSION_FROM'	=> 'EncWords.pm',
 	'PREREQ_PM'	=> ($] >= 5.008001)? {
 	    'Encode'		=> 1.98,
-	    'MIME::Charset'	=> 1.006,
+	    'MIME::Charset'	=> '1.006.1',
 	    'MIME::Base64'	=> 2.13,
 	    'Test'		=> 0,
 	}: {
-	    'MIME::Charset'	=> 1.006,
+	    'MIME::Charset'	=> '1.006',
 	    'MIME::Base64'	=> 2.13,
 	    'Test'		=> 0,
 	},

Modified: trunk/libmime-encwords-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-encwords-perl/debian/changelog?rev=18656&op=diff
==============================================================================
--- trunk/libmime-encwords-perl/debian/changelog (original)
+++ trunk/libmime-encwords-perl/debian/changelog Wed Apr 16 14:44:22 2008
@@ -1,3 +1,9 @@
+libmime-encwords-perl (1.010.10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 16 Apr 2008 16:42:48 +0200
+
 libmime-encwords-perl (1.010-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libmime-encwords-perl/t/02encode.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmime-encwords-perl/t/02encode.t?rev=18656&op=diff
==============================================================================
--- trunk/libmime-encwords-perl/t/02encode.t (original)
+++ trunk/libmime-encwords-perl/t/02encode.t Wed Apr 16 14:44:22 2008
@@ -33,7 +33,7 @@
 
 	my $enc = encode_mimewords(@params);
 	ok((($isgood && !$@) or (!$isgood && $@)) &&
-           ($isgood ? $enc : $expect), $expect, $enc);
+           ($isgood ? $enc : $expect), $expect, $@ || $enc);
     }
     close WORDS;
   }