r22541 - in /branches/upstream/libi18n-charset-perl/current: ./ inc/Module/ inc/Module/Install/ lib/I18N/

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Mon Jun 30 18:27:05 UTC 2008 

Author: gregoa
Date: Mon Jun 30 18:27:05 2008
New Revision: 22541

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

Modified:
    branches/upstream/libi18n-charset-perl/current/META.yml
    branches/upstream/libi18n-charset-perl/current/Makefile.PL
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install.pm
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Base.pm
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Can.pm
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Fetch.pm
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Makefile.pm
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Metadata.pm
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Win32.pm
    branches/upstream/libi18n-charset-perl/current/inc/Module/Install/WriteAll.pm
    branches/upstream/libi18n-charset-perl/current/lib/I18N/Charset.pm

Modified: branches/upstream/libi18n-charset-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/META.yml?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/META.yml (original)
+++ branches/upstream/libi18n-charset-perl/current/META.yml Mon Jun 30 18:27:05 2008
@@ -1,13 +1,14 @@
 ---
+abstract: 'IANA Character Set Registry names and Unicode::MapUTF8'
 author:
-  - 'Martin Thurn <mthurn at cpan.org>'
+  - 'Martin Thurn, C<mthurn at cpan.org>, L<http://tinyurl.com/nn67z>.'
 build_requires:
   IO::Capture::Stderr: 0
   Test::More: 0
   Test::Pod: 0
   Test::Pod::Coverage: 0
 distribution_type: module
-generated_by: 'Module::Install version 0.73'
+generated_by: 'Module::Install version 0.75'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.3.html
@@ -27,4 +28,4 @@
 requires:
   IO::String: 0
   perl: 5.004
-version: 1.389
+version: 1.391

Modified: branches/upstream/libi18n-charset-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/Makefile.PL?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/Makefile.PL (original)
+++ branches/upstream/libi18n-charset-perl/current/Makefile.PL Mon Jun 30 18:27:05 2008
@@ -1,13 +1,10 @@
 
-# $Id: Makefile.PL,v 1.16 2008/05/24 18:10:37 Martin Exp $
+# $Id: Makefile.PL,v 1.17 2008/06/29 02:12:37 Martin Exp $
 
 use inc::Module::Install;
 
 name('I18N-Charset');
-version_from('lib/I18N/Charset.pm');
-
-author('Martin Thurn <mthurn at cpan.org>');
-license('perl');
+all_from('lib/I18N/Charset.pm');
 
 requires( perl => '5.004' );
 recommends('App::Info::Lib::Iconv');

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install.pm Mon Jun 30 18:27:05 2008
@@ -30,7 +30,7 @@
 	# This is not enforced yet, but will be some time in the next few
 	# releases once we can make sure it won't clash with custom
 	# Module::Install extensions.
-	$VERSION = '0.73';
+	$VERSION = '0.75';
 
 	*inc::Module::Install::VERSION = *VERSION;
 	@inc::Module::Install::ISA     = __PACKAGE__;
@@ -85,7 +85,7 @@
 
 # Build.PL was formerly supported, but no longer is due to excessive
 # difficulty in implementing every single feature twice.
-if ( $0 =~ /Build.PL$/i or -f 'Build.PL' ) { die <<"END_DIE" }
+if ( $0 =~ /Build.PL$/i ) { die <<"END_DIE" }
 
 Module::Install no longer supports Build.PL.
 

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Base.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Base.pm Mon Jun 30 18:27:05 2008
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.73';
+$VERSION = '0.75';
 
 # Suspend handler for "redefined" warnings
 BEGIN {

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Can.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Can.pm Mon Jun 30 18:27:05 2008
@@ -11,7 +11,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.73';
+	$VERSION = '0.75';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Fetch.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Fetch.pm Mon Jun 30 18:27:05 2008
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.73';
+	$VERSION = '0.75';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Makefile.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Makefile.pm Mon Jun 30 18:27:05 2008
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.73';
+	$VERSION = '0.75';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Metadata.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Metadata.pm Mon Jun 30 18:27:05 2008
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.73';
+	$VERSION = '0.75';
 	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
@@ -30,6 +30,7 @@
 	requires
 	recommends
 	bundles
+	resources
 };
 
 sub Meta            { shift        }
@@ -72,7 +73,7 @@
 		my $version = shift || 0;
 		push @{ $self->{values}->{configure_requires} }, [ $module, $version ];
 	}
-	$self->{values}{configure_requires};
+	$self->{values}->{configure_requires};
 }
 
 sub recommends {
@@ -82,7 +83,7 @@
 		my $version = shift || 0;
 		push @{ $self->{values}->{recommends} }, [ $module, $version ];
 	}
-	$self->{values}{recommends};
+	$self->{values}->{recommends};
 }
 
 sub bundles {
@@ -92,7 +93,24 @@
 		my $version = shift || 0;
 		push @{ $self->{values}->{bundles} }, [ $module, $version ];
 	}
-	$self->{values}{bundles};
+	$self->{values}->{bundles};
+}
+
+# Resource handling
+sub resources {
+	my $self = shift;
+	while ( @_ ) {
+		my $resource = shift or last;
+		my $value    = shift or next;
+		push @{ $self->{values}->{resources} }, [ $resource, $value ];
+	}
+	$self->{values}->{resources};
+}
+
+sub repository {
+	my $self = shift;
+	$self->resources( repository => shift );
+	return 1;
 }
 
 # Aliases for build_requires that will have alternative
@@ -294,7 +312,7 @@
 	if (
 		Module::Install::_read($_[0]) =~ m/
 		^
-		use \s*
+		(?:use|require) \s*
 		v?
 		([\d_\.]+)
 		\s* ;

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Win32.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install/Win32.pm Mon Jun 30 18:27:05 2008
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.73';
+	$VERSION = '0.75';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libi18n-charset-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/inc/Module/Install/WriteAll.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/inc/Module/Install/WriteAll.pm Mon Jun 30 18:27:05 2008
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.73';
+	$VERSION = '0.75';
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libi18n-charset-perl/current/lib/I18N/Charset.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libi18n-charset-perl/current/lib/I18N/Charset.pm?rev=22541&op=diff
==============================================================================
--- branches/upstream/libi18n-charset-perl/current/lib/I18N/Charset.pm (original)
+++ branches/upstream/libi18n-charset-perl/current/lib/I18N/Charset.pm Mon Jun 30 18:27:05 2008
@@ -1,5 +1,5 @@
 
-# $rcs = ' $Id: Charset.pm,v 1.389 2008/05/24 18:57:17 Martin Exp $ ' ;
+# $rcs = ' $Id: Charset.pm,v 1.391 2008/06/29 02:11:54 Martin Exp $ ' ;
 
 package I18N::Charset;
 
@@ -69,7 +69,7 @@
 #	Public Global Variables
 #-----------------------------------------------------------------------
 our
-$VERSION = do { my @r = (q$Revision: 1.389 $ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
+$VERSION = do { my @r = (q$Revision: 1.391 $ =~ /\d+/g); sprintf "%d."."%03d" x $#r, @r };
 our @EXPORT = qw( iana_charset_name
 map8_charset_name
 umap_charset_name
@@ -532,7 +532,7 @@
   } # umap_charset_name
 
 
-my @asMap8Debug;
+our @asMap8Debug;
 
 =item umu8_charset_name()
 
@@ -867,9 +867,7 @@
 
 Martin Thurn, C<mthurn at cpan.org>, L<http://tinyurl.com/nn67z>.
 
-=head1 COPYRIGHT
-
-Copyright (c) 1998-2008 Martin Thurn
+=head1 LICENSE
 
 This module is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.

More information about the Pkg-perl-cvs-commits mailing list