r58779 - in /branches/upstream/libnet-mac-perl/current: ./ inc/Module/ inc/Module/Install/ lib/Net/ t/
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Thu Jun 3 09:19:50 UTC 2010
Author: ansgar-guest
Date: Thu Jun 3 09:18:54 2010
New Revision: 58779
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=58779
Log:
[svn-upgrade] Integrating new upstream version, libnet-mac-perl (1.6)
Modified:
branches/upstream/libnet-mac-perl/current/Changes
branches/upstream/libnet-mac-perl/current/META.yml
branches/upstream/libnet-mac-perl/current/inc/Module/Install.pm
branches/upstream/libnet-mac-perl/current/inc/Module/Install/Base.pm
branches/upstream/libnet-mac-perl/current/inc/Module/Install/Can.pm
branches/upstream/libnet-mac-perl/current/inc/Module/Install/Fetch.pm
branches/upstream/libnet-mac-perl/current/inc/Module/Install/Makefile.pm
branches/upstream/libnet-mac-perl/current/inc/Module/Install/Metadata.pm
branches/upstream/libnet-mac-perl/current/inc/Module/Install/Win32.pm
branches/upstream/libnet-mac-perl/current/inc/Module/Install/WriteAll.pm
branches/upstream/libnet-mac-perl/current/lib/Net/MAC.pm
branches/upstream/libnet-mac-perl/current/t/10_convert_args.t
branches/upstream/libnet-mac-perl/current/t/Net-MAC.t
branches/upstream/libnet-mac-perl/current/t/bulk10.t
branches/upstream/libnet-mac-perl/current/t/bulk16.t
Modified: branches/upstream/libnet-mac-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/Changes?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/Changes (original)
+++ branches/upstream/libnet-mac-perl/current/Changes Thu Jun 3 09:18:54 2010
@@ -1,4 +1,7 @@
# This file documents the revision history for Perl extension Net::MAC.
+
+1.6 2010-06-02 10:49 GMT
+ - Fix test for changes to Test::Simple (RT.cpan#57867)
1.5 2008-11-08 17:42 GMT
- Move to Module::Install
Modified: branches/upstream/libnet-mac-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/META.yml?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/META.yml (original)
+++ branches/upstream/libnet-mac-perl/current/META.yml Thu Jun 3 09:18:54 2010
@@ -7,8 +7,8 @@
Test::Pod: 0
Test::Pod::Coverage: 0
distribution_type: module
-generated_by: 'Module::Install version 0.77'
-license: gpl
+generated_by: 'Module::Install version 0.76'
+license: unknown
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
@@ -19,4 +19,4 @@
- t
requires:
perl: 5.8.1
-version: 1.5
+version: 1.6
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install.pm Thu Jun 3 09:18:54 2010
@@ -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.77';
+ $VERSION = '0.76';
*inc::Module::Install::VERSION = *VERSION;
@inc::Module::Install::ISA = __PACKAGE__;
@@ -125,10 +125,8 @@
goto &$code unless $cwd eq $pwd;
}
$$sym =~ /([^:]+)$/ or die "Cannot autoload $who - $sym";
- unless ( uc($1) eq $1 ) {
- unshift @_, ( $self, $1 );
- goto &{$self->can('call')};
- }
+ unshift @_, ( $self, $1 );
+ goto &{$self->can('call')} unless uc($1) eq $1;
};
}
@@ -341,9 +339,6 @@
close FH or die "close($_[0]): $!";
}
-# _version is for processing module versions (eg, 1.03_05) not
-# Perl versions (eg, 5.8.1).
-
sub _version ($) {
my $s = shift || 0;
$s =~ s/^(\d+)\.?//;
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install/Base.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install/Base.pm Thu Jun 3 09:18:54 2010
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.77';
+$VERSION = '0.76';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install/Can.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install/Can.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install/Can.pm Thu Jun 3 09:18:54 2010
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.76';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -39,7 +39,6 @@
return $_cmd if (-x $_cmd or $_cmd = MM->maybe_command($_cmd));
for my $dir ((split /$Config::Config{path_sep}/, $ENV{PATH}), '.') {
- next if $dir eq '';
my $abs = File::Spec->catfile($dir, $_[1]);
return $abs if (-x $abs or $abs = MM->maybe_command($abs));
}
@@ -80,4 +79,4 @@
__END__
-#line 158
+#line 157
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install/Fetch.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install/Fetch.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install/Fetch.pm Thu Jun 3 09:18:54 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.76';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install/Makefile.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install/Makefile.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install/Makefile.pm Thu Jun 3 09:18:54 2010
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.76';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -181,9 +181,7 @@
my $user_preop = delete $args{dist}->{PREOP};
if (my $preop = $self->admin->preop($user_preop)) {
- foreach my $key ( keys %$preop ) {
- $args{dist}->{$key} = $preop->{$key};
- }
+ $args{dist} = $preop;
}
my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -250,4 +248,4 @@
__END__
-#line 379
+#line 377
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install/Metadata.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install/Metadata.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install/Metadata.pm Thu Jun 3 09:18:54 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.76';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -175,12 +175,6 @@
my $version = shift or die(
"Did not provide a value to perl_version()"
);
-
- # Convert triple-part versions (eg, 5.6.1 or 5.8.9) to
- # numbers (eg, 5.006001 or 5.008009).
-
- $version =~ s/^(\d+)\.(\d+)\.(\d+)$/sprintf("%d.%03d%03d",$1,$2,$3)/e;
-
$version =~ s/_.+$//;
$version = $version + 0; # Numify
unless ( $version >= 5.005 ) {
@@ -218,9 +212,6 @@
unless ( -e $file ) {
die("all_from cannot find $file from $name");
}
- }
- unless ( -f $file ) {
- die("The path '$file' does not exist, or is not a file");
}
# Some methods pull from POD instead of code.
@@ -433,12 +424,8 @@
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,
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install/Win32.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install/Win32.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install/Win32.pm Thu Jun 3 09:18:54 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.76';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libnet-mac-perl/current/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/inc/Module/Install/WriteAll.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/inc/Module/Install/WriteAll.pm (original)
+++ branches/upstream/libnet-mac-perl/current/inc/Module/Install/WriteAll.pm Thu Jun 3 09:18:54 2010
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '0.77';
+ $VERSION = '0.76';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: branches/upstream/libnet-mac-perl/current/lib/Net/MAC.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/lib/Net/MAC.pm?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/lib/Net/MAC.pm (original)
+++ branches/upstream/libnet-mac-perl/current/lib/Net/MAC.pm Thu Jun 3 09:18:54 2010
@@ -29,9 +29,9 @@
'ne' => \&_compare_string_ne;
# RCS ident string
-#my $rcs_id = '$Id: MAC.pm 283 2008-11-08 17:47:16Z oliver $';
-
-our $VERSION = '1.5';
+#my $rcs_id = '$Id: MAC.pm 765 2010-06-02 09:50:18Z oliver $';
+
+our $VERSION = '1.6';
$VERSION = eval $VERSION; # numify for warning-free dev releases
our $AUTOLOAD;
Modified: branches/upstream/libnet-mac-perl/current/t/10_convert_args.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/t/10_convert_args.t?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/t/10_convert_args.t (original)
+++ branches/upstream/libnet-mac-perl/current/t/10_convert_args.t Thu Jun 3 09:18:54 2010
@@ -1,4 +1,4 @@
-# $Id: 10_convert_args.t 250 2008-11-06 20:58:23Z oliver $
+# $Id: 10_convert_args.t 765 2010-06-02 09:50:18Z oliver $
use Test::More tests => 5;
#use Test::More qw(no_plan);
@@ -10,11 +10,11 @@
isa_ok($mac, 'Net::MAC');
my $mac_defaults = $mac->convert;
-is($mac_defaults, '01:ab:01:ab:01:ab', 'convert() using defaults');
+is("$mac_defaults", '01:ab:01:ab:01:ab', 'convert() using defaults');
my $mac_bitgroup = $mac->convert(bit_group => 8);
-is($mac_bitgroup, '01:ab:01:ab:01:ab', 'convert() using bit_group and default delimiter');
+is("$mac_bitgroup", '01:ab:01:ab:01:ab', 'convert() using bit_group and default delimiter');
my $mac_bitgroup_delim = $mac->convert(bit_group => 12, delimiter => '-');
-is($mac_bitgroup_delim, '01a-b01-ab0-1ab', 'convert() using bit_group 12 and hyphen delimiter');
+is("$mac_bitgroup_delim", '01a-b01-ab0-1ab', 'convert() using bit_group 12 and hyphen delimiter');
Modified: branches/upstream/libnet-mac-perl/current/t/Net-MAC.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/t/Net-MAC.t?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/t/Net-MAC.t (original)
+++ branches/upstream/libnet-mac-perl/current/t/Net-MAC.t Thu Jun 3 09:18:54 2010
@@ -1,4 +1,4 @@
-# $Id: Net-MAC.t 250 2008-11-06 20:58:23Z oliver $
+# $Id: Net-MAC.t 135 2008-03-30 18:20:42Z oliver $
# Before `make install' is performed this script should be runnable with
# `make test'. After `make install' it should work as `perl Net-MAC.t'
Modified: branches/upstream/libnet-mac-perl/current/t/bulk10.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/t/bulk10.t?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/t/bulk10.t (original)
+++ branches/upstream/libnet-mac-perl/current/t/bulk10.t Thu Jun 3 09:18:54 2010
@@ -1,4 +1,4 @@
-# $Id: bulk10.t 250 2008-11-06 20:58:23Z oliver $
+# $Id: bulk10.t 135 2008-03-30 18:20:42Z oliver $
# This is a Test::More test script for Net::MAC. This script should be
# runnable with `make test'.
Modified: branches/upstream/libnet-mac-perl/current/t/bulk16.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libnet-mac-perl/current/t/bulk16.t?rev=58779&op=diff
==============================================================================
--- branches/upstream/libnet-mac-perl/current/t/bulk16.t (original)
+++ branches/upstream/libnet-mac-perl/current/t/bulk16.t Thu Jun 3 09:18:54 2010
@@ -1,4 +1,4 @@
-# $Id: bulk16.t 250 2008-11-06 20:58:23Z oliver $
+# $Id: bulk16.t 135 2008-03-30 18:20:42Z oliver $
# This is a Test::More test script for Net::MAC. This script should be
# runnable with `make test'.
More information about the Pkg-perl-cvs-commits
mailing list