r18654 - in /branches/upstream/libmime-encwords-perl/current: Changes EncWords.pm META.yml Makefile.PL t/02encode.t
gregoa-guest at users.alioth.debian.org
gregoa-guest at users.alioth.debian.org
Wed Apr 16 14:42:24 UTC 2008
Author: gregoa-guest
Date: Wed Apr 16 14:42:23 2008
New Revision: 18654
URL: http://svn.debian.org/wsvn/?sc=1&rev=18654
Log:
[svn-upgrade] Integrating new upstream version, libmime-encwords-perl (1.010.10)
Modified:
branches/upstream/libmime-encwords-perl/current/Changes
branches/upstream/libmime-encwords-perl/current/EncWords.pm
branches/upstream/libmime-encwords-perl/current/META.yml
branches/upstream/libmime-encwords-perl/current/Makefile.PL
branches/upstream/libmime-encwords-perl/current/t/02encode.t
Modified: branches/upstream/libmime-encwords-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/Changes?rev=18654&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/Changes (original)
+++ branches/upstream/libmime-encwords-perl/current/Changes Wed Apr 16 14:42:23 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: branches/upstream/libmime-encwords-perl/current/EncWords.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/EncWords.pm?rev=18654&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/EncWords.pm (original)
+++ branches/upstream/libmime-encwords-perl/current/EncWords.pm Wed Apr 16 14:42:23 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: branches/upstream/libmime-encwords-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/META.yml?rev=18654&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/META.yml (original)
+++ branches/upstream/libmime-encwords-perl/current/META.yml Wed Apr 16 14:42:23 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: branches/upstream/libmime-encwords-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/Makefile.PL?rev=18654&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/Makefile.PL (original)
+++ branches/upstream/libmime-encwords-perl/current/Makefile.PL Wed Apr 16 14:42:23 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: branches/upstream/libmime-encwords-perl/current/t/02encode.t
URL: http://svn.debian.org/wsvn/branches/upstream/libmime-encwords-perl/current/t/02encode.t?rev=18654&op=diff
==============================================================================
--- branches/upstream/libmime-encwords-perl/current/t/02encode.t (original)
+++ branches/upstream/libmime-encwords-perl/current/t/02encode.t Wed Apr 16 14:42:23 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;
}
More information about the Pkg-perl-cvs-commits
mailing list