r48803 - in /trunk/libpoe-filter-ircd-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/POE/Filter/ t/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Wed Dec 16 00:33:50 UTC 2009


Author: jawnsy-guest
Date: Wed Dec 16 00:33:40 2009
New Revision: 48803

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=48803
Log:
* New upstream release
* Add myself to Uploaders and Copyright
* Standards-Version 3.8.3 (drop perl version dep)

Added:
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/GithubMeta.pm
      - copied unchanged from r48801, branches/upstream/libpoe-filter-ircd-perl/current/inc/Module/Install/GithubMeta.pm
    trunk/libpoe-filter-ircd-perl/t/02_dancer.t
      - copied unchanged from r48801, branches/upstream/libpoe-filter-ircd-perl/current/t/02_dancer.t
Modified:
    trunk/libpoe-filter-ircd-perl/Changes
    trunk/libpoe-filter-ircd-perl/LICENSE
    trunk/libpoe-filter-ircd-perl/MANIFEST
    trunk/libpoe-filter-ircd-perl/META.yml
    trunk/libpoe-filter-ircd-perl/Makefile.PL
    trunk/libpoe-filter-ircd-perl/debian/changelog
    trunk/libpoe-filter-ircd-perl/debian/control
    trunk/libpoe-filter-ircd-perl/debian/copyright
    trunk/libpoe-filter-ircd-perl/inc/Module/Install.pm
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/Base.pm
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/Can.pm
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/Fetch.pm
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/Makefile.pm
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/Metadata.pm
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/Win32.pm
    trunk/libpoe-filter-ircd-perl/inc/Module/Install/WriteAll.pm
    trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm
    trunk/libpoe-filter-ircd-perl/t/01_ircd.t

Modified: trunk/libpoe-filter-ircd-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/Changes?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/Changes (original)
+++ trunk/libpoe-filter-ircd-perl/Changes Wed Dec 16 00:33:40 2009
@@ -1,6 +1,7 @@
 POE::Filter::IRCD
 =================
 
+2.42	Allow 005 numerics with more than 13 parameters.
 2.40	Changed to AutoLicense, tidied up the POD.
 2.38	Removed kwalitee test and added license information.
 2.36	Kwalitee fixes.

Modified: trunk/libpoe-filter-ircd-perl/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/LICENSE?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/LICENSE (original)
+++ trunk/libpoe-filter-ircd-perl/LICENSE Wed Dec 16 00:33:40 2009
@@ -1,9 +1,9 @@
 This software is copyright (c) 2009 by Chris Williams and Jonathan Steinert.
 
 This is free software; you can redistribute it and/or modify it under
-the same terms as perl itself.
-
-Terms of Perl itself
+the same terms as the Perl 5 programming language system itself.
+
+Terms of the Perl programming language system itself
 
 a) the GNU General Public License as published by the Free
    Software Foundation; either version 1, or (at your option) any

Modified: trunk/libpoe-filter-ircd-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/MANIFEST?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/MANIFEST (original)
+++ trunk/libpoe-filter-ircd-perl/MANIFEST Wed Dec 16 00:33:40 2009
@@ -5,6 +5,7 @@
 inc/Module/Install/Base.pm
 inc/Module/Install/Can.pm
 inc/Module/Install/Fetch.pm
+inc/Module/Install/GithubMeta.pm
 inc/Module/Install/Makefile.pm
 inc/Module/Install/Metadata.pm
 inc/Module/Install/Win32.pm
@@ -17,5 +18,6 @@
 README
 t/00_use.t
 t/01_ircd.t
+t/02_dancer.t
 t/99_pod.t
 t/99_pod_coverage.t

Modified: trunk/libpoe-filter-ircd-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/META.yml?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/META.yml (original)
+++ trunk/libpoe-filter-ircd-perl/META.yml Wed Dec 16 00:33:40 2009
@@ -8,7 +8,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.85'
+generated_by: 'Module::Install version 0.91'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -19,11 +19,16 @@
     - examples
     - inc
     - t
+provides:
+  POE::Filter::IRCD:
+    file: lib/POE/Filter/IRCD.pm
+    version: 2.42
 requires:
   POE: 0.3202
   POE::Filter: 0
   perl: 5.6.0
 resources:
+  homepage: http://github.com/bingos/poe-filter-ircd/tree
   license: http://dev.perl.org/licenses/
   repository: git://github.com/bingos/poe-filter-ircd.git
-version: 2.40
+version: 2.42

Modified: trunk/libpoe-filter-ircd-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/Makefile.PL?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/Makefile.PL (original)
+++ trunk/libpoe-filter-ircd-perl/Makefile.PL Wed Dec 16 00:33:40 2009
@@ -11,5 +11,6 @@
 requires 'POE' => 0.3202;
 requires 'POE::Filter' => 0;
 auto_license holder => 'Chris Williams and Jonathan Steinert';
-eval "auto_set_repository";
+githubmeta;
+auto_provides;
 WriteAll;

Modified: trunk/libpoe-filter-ircd-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/debian/changelog?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/changelog (original)
+++ trunk/libpoe-filter-ircd-perl/debian/changelog Wed Dec 16 00:33:40 2009
@@ -1,4 +1,9 @@
-libpoe-filter-ircd-perl (2.40-2) UNRELEASED; urgency=low
+libpoe-filter-ircd-perl (2.42-1) UNRELEASED; urgency=low
+
+  [ Jonathan Yu ]
+  * New upstream release
+  * Add myself to Uploaders and Copyright
+  * Standards-Version 3.8.3 (drop perl version dep)
 
   [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
@@ -6,7 +11,7 @@
   [ Ryan Niebur ]
   * Update ryan52's email address
 
- -- Ryan Niebur <ryan at debian.org>  Fri, 25 Sep 2009 00:26:05 -0700
+ -- Jonathan Yu <jawnsy at cpan.org>  Tue, 15 Dec 2009 16:13:00 -0500
 
 libpoe-filter-ircd-perl (2.40-1) unstable; urgency=low
 

Modified: trunk/libpoe-filter-ircd-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/debian/control?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/control (original)
+++ trunk/libpoe-filter-ircd-perl/debian/control Wed Dec 16 00:33:40 2009
@@ -2,13 +2,13 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl (>= 5.6.0-17), libpoe-perl, libtest-pod-perl,
+Build-Depends-Indep: perl, libpoe-perl, libtest-pod-perl,
  libtest-pod-coverage-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Mayorga <rmayorga at debian.org>,
  Damyan Ivanov <dmn at debian.org>, Martín Ferrari <tincho at debian.org>,
- Ryan Niebur <ryan at debian.org>
-Standards-Version: 3.8.1
+ Ryan Niebur <ryan at debian.org>, Jonathan Yu <jawnsy at cpan.org>
+Standards-Version: 3.8.3
 Homepage: http://search.cpan.org/dist/POE-Filter-IRCD/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libpoe-filter-ircd-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/

Modified: trunk/libpoe-filter-ircd-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/debian/copyright?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/debian/copyright (original)
+++ trunk/libpoe-filter-ircd-perl/debian/copyright Wed Dec 16 00:33:40 2009
@@ -5,20 +5,24 @@
 Upstream-Name: POE-Filter-IRCD
 
 Files: *
-Copyright: 2009 by Chris Williams and Jonathan Steinert
+Copyright: 2009, Chris Williams <chris at bingosnet.co.uk>
+ 2009, Jonathan Steinert <hachi at cpan.org>
 License-Alias: Perl
 License: Artistic | GPL-1+
 
-Files: inc/*
-Copyright: 2008 - 2009 Adam Kennedy
+Files: inc/Module/*
+Copyright: 2002-2009, Adam Kennedy <adamk at cpan.org>
+ 2002-2009, Audrey Tang <autrijus at autrijus.org>
+ 2002-2009, Brian Ingerson <ingy at cpan.org>
 License-Alias: Perl
 License: Artistic | GPL-1+
 
 Files: debian/*
-Copyright: 2005, 2006, Steve Kowalik <stevenk at debian.org>
+Copyright: 2009, Ryan Niebur <ryan at debian.org>
+ 2009, Jonathan Yu <jawnsy at cpan.org>
  2008, Damyan Ivanov <dmn at debian.org>
  2008, Martín Ferrari <tincho at debian.org>
- 2009, Ryan Niebur <ryan at debian.org>
+ 2005-2006, Steve Kowalik <stevenk at debian.org>
 License: Artistic | GPL-1+
 
 License: Artistic

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install.pm Wed Dec 16 00:33:40 2009
@@ -28,7 +28,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.85';
+	$VERSION = '0.91';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -353,7 +353,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '<', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
 	}
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
@@ -384,7 +384,7 @@
 	if ( $] >= 5.006 ) {
 		open( FH, '>', $_[0] ) or die "open($_[0]): $!";
 	} else {
-		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";	
+		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
 	}
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install/Base.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install/Base.pm Wed Dec 16 00:33:40 2009
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
 }
 
 # Suspend handler for "redefined" warnings
@@ -13,42 +13,34 @@
 	$SIG{__WARN__} = sub { $w };
 }
 
-### This is the ONLY module that shouldn't have strict on
-# use strict;
-
-#line 45
+#line 42
 
 sub new {
-	my ($class, %args) = @_;
-
-	foreach my $method ( qw(call load) ) {
-		next if defined &{"$class\::$method"};
-		*{"$class\::$method"} = sub {
-			shift()->_top->$method(@_);
-		};
+	my $class = shift;
+	unless ( defined &{"${class}::call"} ) {
+		*{"${class}::call"} = sub { shift->_top->call(@_) };
 	}
-
-	bless( \%args, $class );
+	unless ( defined &{"${class}::load"} ) {
+		*{"${class}::load"} = sub { shift->_top->load(@_) };
+	}
+	bless { @_ }, $class;
 }
 
-#line 66
+#line 61
 
 sub AUTOLOAD {
-	my $self = shift;
 	local $@;
-	my $autoload = eval {
-		$self->_top->autoload
-	} or return;
-	goto &$autoload;
+	my $func = eval { shift->_top->autoload } or return;
+	goto &$func;
 }
 
-#line 83
+#line 75
 
 sub _top {
 	$_[0]->{_top};
 }
 
-#line 98
+#line 90
 
 sub admin {
 	$_[0]->_top->{admin}
@@ -56,7 +48,7 @@
 	Module::Install::Base::FakeAdmin->new;
 }
 
-#line 114
+#line 106
 
 sub is_admin {
 	$_[0]->admin->VERSION;
@@ -83,4 +75,4 @@
 
 1;
 
-#line 162
+#line 154

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install/Can.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install/Can.pm Wed Dec 16 00:33:40 2009
@@ -2,16 +2,16 @@
 package Module::Install::Can;
 
 use strict;
-use Module::Install::Base;
-use Config              ();
-use File::Spec          ();
-use ExtUtils::MakeMaker ();
+use Config                ();
+use File::Spec            ();
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 # check if we can load some module

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install/Fetch.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install/Fetch.pm Wed Dec 16 00:33:40 2009
@@ -2,13 +2,13 @@
 package Module::Install::Fetch;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
-use vars qw{$VERSION $ISCORE @ISA};
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub get_file {

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install/Makefile.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install/Makefile.pm Wed Dec 16 00:33:40 2009
@@ -2,14 +2,14 @@
 package Module::Install::Makefile;
 
 use strict 'vars';
-use Module::Install::Base;
-use ExtUtils::MakeMaker ();
-
-use vars qw{$VERSION $ISCORE @ISA};
+use ExtUtils::MakeMaker   ();
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
-	@ISA     = qw{Module::Install::Base};
 }
 
 sub Makefile { $_[0] }

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install/Metadata.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install/Metadata.pm Wed Dec 16 00:33:40 2009
@@ -2,18 +2,17 @@
 package Module::Install::Metadata;
 
 use strict 'vars';
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 
 my @boolean_keys = qw{
 	sign
-	mymeta
 };
 
 my @scalar_keys = qw{
@@ -440,21 +439,21 @@
 	/ixms ) {
 		my $license_text = $1;
 		my @phrases      = (
-			'under the same (?:terms|license) as perl itself' => 'perl',        1,
-			'GNU general public license'                      => 'gpl',         1,
-			'GNU public license'                              => 'gpl',         1,
-			'GNU lesser general public license'               => 'lgpl',        1,
-			'GNU lesser public license'                       => 'lgpl',        1,
-			'GNU library general public license'              => 'lgpl',        1,
-			'GNU library public license'                      => 'lgpl',        1,
-			'BSD license'                                     => 'bsd',         1,
-			'Artistic license'                                => 'artistic',    1,
-			'GPL'                                             => 'gpl',         1,
-			'LGPL'                                            => 'lgpl',        1,
-			'BSD'                                             => 'bsd',         1,
-			'Artistic'                                        => 'artistic',    1,
-			'MIT'                                             => 'mit',         1,
-			'proprietary'                                     => 'proprietary', 0,
+			'under the same (?:terms|license) as (?:perl|the perl programming language) itself' => 'perl', 1,
+			'GNU general public license'         => 'gpl',         1,
+			'GNU public license'                 => 'gpl',         1,
+			'GNU lesser general public license'  => 'lgpl',        1,
+			'GNU lesser public license'          => 'lgpl',        1,
+			'GNU library general public license' => 'lgpl',        1,
+			'GNU library public license'         => 'lgpl',        1,
+			'BSD license'                        => 'bsd',         1,
+			'Artistic license'                   => 'artistic',    1,
+			'GPL'                                => 'gpl',         1,
+			'LGPL'                               => 'lgpl',        1,
+			'BSD'                                => 'bsd',         1,
+			'Artistic'                           => 'artistic',    1,
+			'MIT'                                => 'mit',         1,
+			'proprietary'                        => 'proprietary', 0,
 		);
 		while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
 			$pattern =~ s{\s+}{\\s+}g;
@@ -506,17 +505,29 @@
 	}
 }
 
+sub test_requires_from {
+	my $self     = shift;
+	my $content  = Module::Install::_readperl($_[0]);
+	my @requires = $content =~ m/^use\s+([^\W\d]\w*(?:::\w+)*)\s+([\d\.]+)/mg;
+	while ( @requires ) {
+		my $module  = shift @requires;
+		my $version = shift @requires;
+		$self->test_requires( $module => $version );
+	}
+}
+
 # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
 # numbers (eg, 5.006001 or 5.008009).
 # Also, convert double-part versions (eg, 5.8)
 sub _perl_version {
 	my $v = $_[-1];
-	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;	
+	$v =~ s/^([1-9])\.([1-9]\d?\d?)$/sprintf("%d.%03d",$1,$2)/e;
 	$v =~ s/^([1-9])\.([1-9]\d?\d?)\.(0|[1-9]\d?\d?)$/sprintf("%d.%03d%03d",$1,$2,$3 || 0)/e;
 	$v =~ s/(\.\d\d\d)000$/$1/;
 	$v =~ s/_.+$//;
 	if ( ref($v) ) {
-		$v = $v + 0; # Numify
+		# Numify
+		$v = $v + 0;
 	}
 	return $v;
 }
@@ -526,21 +537,56 @@
 
 
 ######################################################################
-# MYMETA.yml Support
+# MYMETA Support
 
 sub WriteMyMeta {
 	die "WriteMyMeta has been deprecated";
 }
 
-sub write_mymeta {
-	my $self = shift;
-	
-	# If there's no existing META.yml there is nothing we can do
-	return unless -f 'META.yml';
+sub write_mymeta_yaml {
+	my $self = shift;
 
 	# We need YAML::Tiny to write the MYMETA.yml file
 	unless ( eval { require YAML::Tiny; 1; } ) {
 		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.yml\n";
+	YAML::Tiny::DumpFile('MYMETA.yml', $meta);
+}
+
+sub write_mymeta_json {
+	my $self = shift;
+
+	# We need JSON to write the MYMETA.json file
+	unless ( eval { require JSON; 1; } ) {
+		return 1;
+	}
+
+	# Generate the data
+	my $meta = $self->_write_mymeta_data or return 1;
+
+	# Save as the MYMETA.yml file
+	print "Writing MYMETA.json\n";
+	Module::Install::_write(
+		'MYMETA.json',
+		JSON->new->pretty(1)->canonical->encode($meta),
+	);
+}
+
+sub _write_mymeta_data {
+	my $self = shift;
+
+	# If there's no existing META.yml there is nothing we can do
+	return undef unless -f 'META.yml';
+
+	# We need Parse::CPAN::Meta to load the file
+	unless ( eval { require Parse::CPAN::Meta; 1; } ) {
+		return undef;
 	}
 
 	# Merge the perl version into the dependencies
@@ -558,7 +604,7 @@
 	}
 
 	# Load the advisory META.yml file
-	my @yaml = YAML::Tiny::LoadFile('META.yml');
+	my @yaml = Parse::CPAN::Meta::LoadFile('META.yml');
 	my $meta = $yaml[0];
 
 	# Overwrite the non-configure dependency hashs
@@ -572,9 +618,7 @@
 		$meta->{build_requires} = { map { @$_ } @{ $val->{build_requires} } };
 	}
 
-	# Save as the MYMETA.yml file
-	print "Writing MYMETA.yml\n";
-	YAML::Tiny::DumpFile('MYMETA.yml', $meta);	
+	return $meta;
 }
 
 1;

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install/Win32.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install/Win32.pm Wed Dec 16 00:33:40 2009
@@ -2,12 +2,12 @@
 package Module::Install::Win32;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
-	@ISA     = qw{Module::Install::Base};
+	$VERSION = '0.91';
+	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
 

Modified: trunk/libpoe-filter-ircd-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/inc/Module/Install/WriteAll.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libpoe-filter-ircd-perl/inc/Module/Install/WriteAll.pm Wed Dec 16 00:33:40 2009
@@ -2,11 +2,11 @@
 package Module::Install::WriteAll;
 
 use strict;
-use Module::Install::Base;
+use Module::Install::Base ();
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.85';
+	$VERSION = '0.91';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }
@@ -41,8 +41,18 @@
 
 	# The Makefile write process adds a couple of dependencies,
 	# so write the META.yml files after the Makefile.
-	$self->Meta->write        if $args{meta};
-	$self->Meta->write_mymeta if $self->mymeta;
+	if ( $args{meta} ) {
+		$self->Meta->write;
+	}
+
+	# Experimental support for MYMETA
+	if ( $ENV{X_MYMETA} ) {
+		if ( $ENV{X_MYMETA} eq 'JSON' ) {
+			$self->Meta->write_mymeta_json;
+		} else {
+			$self->Meta->write_mymeta_yaml;
+		}
+	}
 
 	return 1;
 }

Modified: trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm (original)
+++ trunk/libpoe-filter-ircd-perl/lib/POE/Filter/IRCD.pm Wed Dec 16 00:33:40 2009
@@ -6,7 +6,7 @@
 use vars qw($VERSION);
 use base qw(POE::Filter);
 
-$VERSION = '2.40';
+$VERSION = '2.42';
 
 sub _PUT_LITERAL () { 1 }
 
@@ -37,7 +37,7 @@
         $g->{'space'}
         [^\x00\x0a\x0d\x20\x3a]
         [^\x00\x0a\x0d\x20]*
-      ){0,13}           # then match on 0-13 of these,
+      )*                # then match as many of these as possible
     )
   )?                    # otherwise dont match at all.
   (?:

Modified: trunk/libpoe-filter-ircd-perl/t/01_ircd.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpoe-filter-ircd-perl/t/01_ircd.t?rev=48803&op=diff
==============================================================================
--- trunk/libpoe-filter-ircd-perl/t/01_ircd.t (original)
+++ trunk/libpoe-filter-ircd-perl/t/01_ircd.t Wed Dec 16 00:33:40 2009
@@ -37,4 +37,3 @@
 	ok( $parsed eq $original2, 'Self Test' );
   }
 }
-




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