r57688 - in /branches/upstream/libperl-minimumversion-perl/current: ./ inc/Module/ inc/Module/Install/ lib/Perl/ lib/Perl/MinimumVersion/ t/

carnil-guest at users.alioth.debian.org carnil-guest at users.alioth.debian.org
Sat May 8 20:04:44 UTC 2010


Author: carnil-guest
Date: Sat May  8 20:04:36 2010
New Revision: 57688

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57688
Log:
[svn-upgrade] Integrating new upstream version, libperl-minimumversion-perl (1.25)

Modified:
    branches/upstream/libperl-minimumversion-perl/current/Changes
    branches/upstream/libperl-minimumversion-perl/current/META.yml
    branches/upstream/libperl-minimumversion-perl/current/README
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Base.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Can.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Fetch.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Makefile.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Metadata.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Scripts.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Win32.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/With.pm
    branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/WriteAll.pm
    branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm
    branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion/Reason.pm
    branches/upstream/libperl-minimumversion-perl/current/t/02_main.t

Modified: branches/upstream/libperl-minimumversion-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/Changes?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/Changes (original)
+++ branches/upstream/libperl-minimumversion-perl/current/Changes Sat May  8 20:04:36 2010
@@ -1,4 +1,8 @@
 Revision history for Perl extension Perl-MinimumVersion
+
+1.25 Sun 11 Apr 2010
+
+        - Error in minimum_syntax_reason discovered by perl 5.12 (Alexandr Ciornii)
 
 1.24 Fri 22 Jan 2010
 	- The previous changes seem to work well in practice now,

Modified: branches/upstream/libperl-minimumversion-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/META.yml?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/META.yml (original)
+++ branches/upstream/libperl-minimumversion-perl/current/META.yml Sat May  8 20:04:36 2010
@@ -10,7 +10,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.42
 distribution_type: module
-generated_by: 'Module::Install version 0.92'
+generated_by: 'Module::Install version 0.91'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -34,4 +34,4 @@
   ChangeLog: http://fisheye2.atlassian.com/changelog/cpan/trunk/Perl-MinimumVersion
   license: http://dev.perl.org/licenses/
   repository: http://svn.ali.as/cpan/trunk/Perl-MinimumVersion
-version: 1.24
+version: 1.25

Modified: branches/upstream/libperl-minimumversion-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/README?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/README (original)
+++ branches/upstream/libperl-minimumversion-perl/current/README Sat May  8 20:04:36 2010
@@ -7,8 +7,8 @@
       $object = Perl::MinimumVersion->new( $filename );
       $object = Perl::MinimumVersion->new( \$source  );
       $object = Perl::MinimumVersion->new( $ppi_document );
-      
-  # Find the minimum version
+
+      # Find the minimum version
       $version = $object->minimum_version;
 
 DESCRIPTION

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install.pm Sat May  8 20:04:36 2010
@@ -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.92';
+	$VERSION = '0.91';
 
 	# Storage for the pseudo-singleton
 	$MAIN    = undef;
@@ -348,24 +348,17 @@
 	return $call;
 }
 
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
 sub _read {
 	local *FH;
-	open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+	if ( $] >= 5.006 ) {
+		open( FH, '<', $_[0] ) or die "open($_[0]): $!";
+	} else {
+		open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
+	}
 	my $string = do { local $/; <FH> };
 	close FH or die "close($_[0]): $!";
 	return $string;
 }
-END_NEW
-sub _read {
-	local *FH;
-	open( FH, "< $_[0]"  ) or die "open($_[0]): $!";
-	my $string = do { local $/; <FH> };
-	close FH or die "close($_[0]): $!";
-	return $string;
-}
-END_OLD
 
 sub _readperl {
 	my $string = Module::Install::_read($_[0]);
@@ -386,26 +379,18 @@
 	return $string;
 }
 
-# Done in evals to avoid confusing Perl::MinimumVersion
-eval( $] >= 5.006 ? <<'END_NEW' : <<'END_OLD' ); die $@ if $@;
 sub _write {
 	local *FH;
-	open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+	if ( $] >= 5.006 ) {
+		open( FH, '>', $_[0] ) or die "open($_[0]): $!";
+	} else {
+		open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
+	}
 	foreach ( 1 .. $#_ ) {
 		print FH $_[$_] or die "print($_[0]): $!";
 	}
 	close FH or die "close($_[0]): $!";
 }
-END_NEW
-sub _write {
-	local *FH;
-	open( FH, "> $_[0]"  ) or die "open($_[0]): $!";
-	foreach ( 1 .. $#_ ) {
-		print FH $_[$_] or die "print($_[0]): $!";
-	}
-	close FH or die "close($_[0]): $!";
-}
-END_OLD
 
 # _version is for processing module versions (eg, 1.03_05) not
 # Perl versions (eg, 5.8.1).
@@ -442,4 +427,4 @@
 
 1;
 
-# Copyright 2008 - 2010 Adam Kennedy.
+# Copyright 2008 - 2009 Adam Kennedy.

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Base.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Base.pm Sat May  8 20:04:36 2010
@@ -4,7 +4,7 @@
 use strict 'vars';
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 }
 
 # Suspend handler for "redefined" warnings

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Can.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Can.pm Sat May  8 20:04:36 2010
@@ -9,7 +9,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Fetch.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Fetch.pm Sat May  8 20:04:36 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Makefile.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Makefile.pm Sat May  8 20:04:36 2010
@@ -7,7 +7,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -34,17 +34,6 @@
 	}
 }
 
-# Store a cleaned up version of the MakeMaker version,
-# since we need to behave differently in a variety of
-# ways based on the MM version.
-my $makemaker = eval $ExtUtils::MakeMaker::VERSION;
-
-# If we are passed a param, do a "newer than" comparison.
-# Otherwise, just return the MakeMaker version.
-sub makemaker {
-	( @_ < 2 or $makemaker >= eval($_[1]) ) ? $makemaker : 0
-}
-
 sub makemaker_args {
 	my $self = shift;
 	my $args = ( $self->{makemaker_args} ||= {} );
@@ -55,7 +44,7 @@
 # For mm args that take multiple space-seperated args,
 # append an argument to the current list.
 sub makemaker_append {
-	my $self = shift;
+	my $self = sShift;
 	my $name = shift;
 	my $args = $self->makemaker_args;
 	$args->{name} = defined $args->{$name}
@@ -141,13 +130,12 @@
 		# an underscore, even though its own version may contain one!
 		# Hence the funny regexp to get rid of it.  See RT #35800
 		# for details.
-		my $v = $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/;
-		$self->build_requires(     'ExtUtils::MakeMaker' => $v );
-		$self->configure_requires( 'ExtUtils::MakeMaker' => $v );
+		$self->build_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
+		$self->configure_requires( 'ExtUtils::MakeMaker' => $ExtUtils::MakeMaker::VERSION =~ /^(\d+\.\d+)/ );
 	} else {
 		# Allow legacy-compatibility with 5.005 by depending on the
 		# most recent EU:MM that supported 5.005.
-		$self->build_requires(     'ExtUtils::MakeMaker' => 6.42 );
+		$self->build_requires( 'ExtUtils::MakeMaker' => 6.42 );
 		$self->configure_requires( 'ExtUtils::MakeMaker' => 6.42 );
 	}
 
@@ -164,62 +152,42 @@
 		$args->{ABSTRACT} = $self->abstract;
 		$args->{AUTHOR}   = $self->author;
 	}
-	if ( $self->makemaker(6.10) ) {
+	if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
 		$args->{NO_META} = 1;
 	}
-	if ( $self->makemaker(6.17) and $self->sign ) {
+	if ( eval($ExtUtils::MakeMaker::VERSION) > 6.17 and $self->sign ) {
 		$args->{SIGN} = 1;
 	}
 	unless ( $self->is_admin ) {
 		delete $args->{SIGN};
 	}
 
+	# Merge both kinds of requires into prereq_pm
 	my $prereq = ($args->{PREREQ_PM} ||= {});
 	%$prereq = ( %$prereq,
-		map { @$_ } # flatten [module => version]
+		map { @$_ }
 		map { @$_ }
 		grep $_,
-		($self->requires)
+		($self->configure_requires, $self->build_requires, $self->requires)
 	);
 
 	# Remove any reference to perl, PREREQ_PM doesn't support it
 	delete $args->{PREREQ_PM}->{perl};
 
-	# Merge both kinds of requires into BUILD_REQUIRES
-	my $build_prereq = ($args->{BUILD_REQUIRES} ||= {});
-	%$build_prereq = ( %$build_prereq,
-		map { @$_ } # flatten [module => version]
-		map { @$_ }
-		grep $_,
-		($self->configure_requires, $self->build_requires)
-	);
-
-	# Remove any reference to perl, BUILD_REQUIRES doesn't support it
-	delete $args->{BUILD_REQUIRES}->{perl};
-
-	# Delete bundled dists from prereq_pm
+	# merge both kinds of requires into prereq_pm
 	my $subdirs = ($args->{DIR} ||= []);
 	if ($self->bundles) {
 		foreach my $bundle (@{ $self->bundles }) {
 			my ($file, $dir) = @$bundle;
 			push @$subdirs, $dir if -d $dir;
-			delete $build_prereq->{$file}; #Delete from build prereqs only
+			delete $prereq->{$file};
 		}
-	}
-
-	unless ( $self->makemaker('6.55_03') ) {
-		%$prereq = (%$prereq,%$build_prereq);
-		delete $args->{BUILD_REQUIRES};
 	}
 
 	if ( my $perl_version = $self->perl_version ) {
 		eval "use $perl_version; 1"
 			or die "ERROR: perl: Version $] is installed, "
 			. "but we need version >= $perl_version";
-
-		if ( $self->makemaker(6.48) ) {
-			$args->{MIN_PERL_VERSION} = $perl_version;
-		}
 	}
 
 	$args->{INSTALLDIRS} = $self->installdirs;
@@ -297,4 +265,4 @@
 
 __END__
 
-#line 426
+#line 394

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Metadata.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Metadata.pm Sat May  8 20:04:36 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }
@@ -230,8 +230,6 @@
 		die("The path '$file' does not exist, or is not a file");
 	}
 
-    $self->{values}{all_from} = $file;
-
 	# Some methods pull from POD instead of code.
 	# If there is a matching .pod, use that instead
 	my $pod = $file;
@@ -387,10 +385,11 @@
 	}
 }
 
-sub _extract_perl_version {
+sub perl_version_from {
+	my $self = shift;
 	if (
-		$_[0] =~ m/
-		^\s*
+		Module::Install::_read($_[0]) =~ m/
+		^
 		(?:use|require) \s*
 		v?
 		([\d_\.]+)
@@ -399,16 +398,6 @@
 	) {
 		my $perl_version = $1;
 		$perl_version =~ s{_}{}g;
-		return $perl_version;
-	} else {
-		return;
-	}
-}
-
-sub perl_version_from {
-	my $self = shift;
-	my $perl_version=_extract_perl_version(Module::Install::_read($_[0]));
-	if ($perl_version) {
 		$self->perl_version($perl_version);
 	} else {
 		warn "Cannot determine perl version info from $_[0]\n";
@@ -436,12 +425,13 @@
 	}
 }
 
-sub _extract_license {
+sub license_from {
+	my $self = shift;
 	if (
-		$_[0] =~ m/
+		Module::Install::_read($_[0]) =~ m/
 		(
 			=head \d \s+
-			(?:licen[cs]e|licensing|copyrights?|legal)\b
+			(?:licen[cs]e|licensing|copyright|legal)\b
 			.*?
 		)
 		(=head\\d.*|=cut.*|)
@@ -449,8 +439,7 @@
 	/ixms ) {
 		my $license_text = $1;
 		my @phrases      = (
-			'under the same (?:terms|license) as (?:perl|the perl programming language)' => 'perl', 1,
-			'under the terms of (?:perl|the perl programming language) itself' => 'perl', 1,
+			'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,
@@ -467,32 +456,20 @@
 			'proprietary'                        => 'proprietary', 0,
 		);
 		while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
-			$pattern =~ s#\s+#\\s+#gs;
+			$pattern =~ s{\s+}{\\s+}g;
 			if ( $license_text =~ /\b$pattern\b/i ) {
-			        return $license;
+				$self->license($license);
+				return 1;
 			}
 		}
-	} else {
-	        return;
-	}
-}
-
-sub license_from {
-	my $self = shift;
-	if (my $license=_extract_license(Module::Install::_read($_[0]))) {
-		$self->license($license);
-	} else {
-		warn "Cannot determine license info from $_[0]\n";
-		return 'unknown';
-	}
+	}
+
+	warn "Cannot determine license info from $_[0]\n";
+	return 'unknown';
 }
 
 sub _extract_bugtracker {
-	my @links   = $_[0] =~ m#L<(
-	 \Qhttp://rt.cpan.org/\E[^>]+|
-	 \Qhttp://github.com/\E[\w_]+/[\w_]+/issues|
-	 \Qhttp://code.google.com/p/\E[\w_\-]+/issues/list
-	 )>#gx;
+	my @links   = $_[0] =~ m#L<(\Qhttp://rt.cpan.org/\E[^>]+)>#g;
 	my %links;
 	@links{@links}=();
 	@links=keys %links;
@@ -508,7 +485,7 @@
 		return 0;
 	}
 	if ( @links > 1 ) {
-		warn "Found more than one bugtracker link in $_[0]\n";
+		warn "Found more than on rt.cpan.org link in $_[0]\n";
 		return 0;
 	}
 

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Scripts.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Scripts.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Scripts.pm Sat May  8 20:04:36 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Win32.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/Win32.pm Sat May  8 20:04:36 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/With.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/With.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/With.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/With.pm Sat May  8 20:04:36 2010
@@ -8,7 +8,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';
+	$VERSION = '0.91';
 	@ISA     = 'Module::Install::Base';
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/WriteAll.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/inc/Module/Install/WriteAll.pm Sat May  8 20:04:36 2010
@@ -6,7 +6,7 @@
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-	$VERSION = '0.92';;
+	$VERSION = '0.91';;
 	@ISA     = qw{Module::Install::Base};
 	$ISCORE  = 1;
 }

Modified: branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion.pm Sat May  8 20:04:36 2010
@@ -12,7 +12,7 @@
   $object = Perl::MinimumVersion->new( $filename );
   $object = Perl::MinimumVersion->new( \$source  );
   $object = Perl::MinimumVersion->new( $ppi_document );
-  
+
   # Find the minimum version
   $version = $object->minimum_version;
 
@@ -54,7 +54,7 @@
 
 use vars qw{$VERSION @ISA @EXPORT_OK %CHECKS %MATCHES};
 BEGIN {
-	$VERSION = '1.24';
+	$VERSION = '1.25';
 
 	# Only needed for dev releases, comment out otherwise
 	$VERSION = eval $VERSION;
@@ -375,7 +375,7 @@
 		$limit = version->new("$limit");
 	}
 	if ( defined $self->{syntax} ) {
-		if ( $self->{syntax} >= $limit ) {
+		if ( $self->{syntax}->version >= $limit ) {
 			# Previously discovered minimum is what they want
 			return $self->{syntax};
 		}

Modified: branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion/Reason.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion/Reason.pm?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion/Reason.pm (original)
+++ branches/upstream/libperl-minimumversion-perl/current/lib/Perl/MinimumVersion/Reason.pm Sat May  8 20:04:36 2010
@@ -10,7 +10,7 @@
 
 use vars qw{$VERSION};
 BEGIN {
-	$VERSION = '1.24';
+	$VERSION = '1.25';
 
 	# Only needed for dev releases, comment out otherwise
 	$VERSION = eval $VERSION;

Modified: branches/upstream/libperl-minimumversion-perl/current/t/02_main.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libperl-minimumversion-perl/current/t/02_main.t?rev=57688&op=diff
==============================================================================
--- branches/upstream/libperl-minimumversion-perl/current/t/02_main.t (original)
+++ branches/upstream/libperl-minimumversion-perl/current/t/02_main.t Sat May  8 20:04:36 2010
@@ -8,7 +8,7 @@
 	$^W = 1;
 }
 
-use Test::More tests => 74;
+use Test::More tests => 75;
 use version;
 use File::Spec::Functions ':ALL';
 use PPI;
@@ -210,6 +210,11 @@
   "5.006 syntax found when no limit supplied",
 );
 is(
+  $minver->minimum_syntax_version(5.005),
+  5.006,
+  "5.006 syntax found when 5.005 limit supplied",
+);
+is(
   $minver->minimum_syntax_version(version->new(5.008)),
   '',
   "no syntax constraints found when 5.008 limit supplied",
@@ -217,7 +222,7 @@
 is(
   Perl::MinimumVersion->minimum_syntax_version($doc, version->new(5.008)),
   '',
-  "also works as object method with limit: no constriants found",
+  "also works as object method with limit: no constraints found",
 );
 }
 




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