r19594 - in /trunk/libnet-sieve-script-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/Net/Sieve/ lib/Net/Sieve/Script/
yvesago-guest at users.alioth.debian.org
yvesago-guest at users.alioth.debian.org
Wed May 7 07:38:46 UTC 2008
Author: yvesago-guest
Date: Wed May 7 07:38:45 2008
New Revision: 19594
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=19594
Log:
sync with upstream 0.06 : add copyright, fix warnings
Modified:
trunk/libnet-sieve-script-perl/Changes
trunk/libnet-sieve-script-perl/META.yml
trunk/libnet-sieve-script-perl/debian/changelog
trunk/libnet-sieve-script-perl/inc/Module/Install.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/AutoInstall.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/Base.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/Can.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/Fetch.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/Include.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/Makefile.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/Metadata.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/Win32.pm
trunk/libnet-sieve-script-perl/inc/Module/Install/WriteAll.pm
trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script.pm
trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Action.pm
trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Condition.pm
trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Rule.pm
Modified: trunk/libnet-sieve-script-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/Changes?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/Changes (original)
+++ trunk/libnet-sieve-script-perl/Changes Wed May 7 07:38:45 2008
@@ -1,6 +1,10 @@
Revision history for Perl module Net::Sieve::Script
-0.0.5 Fri, 11 Apr 2008 11:31:45 +0200
+0.06 Tue, 6 May 2008 20:20:04 +0200
+ - add copyright
+ - add use warnings, fix uninitialized values
+
+0.05 Fri, 11 Apr 2008 11:31:45 +0200
- use Module::Install instead of ModuleMaker
- add version for all files
Modified: trunk/libnet-sieve-script-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/META.yml?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/META.yml (original)
+++ trunk/libnet-sieve-script-perl/META.yml Wed May 7 07:38:45 2008
@@ -1,11 +1,15 @@
+---
abstract: Parse and write sieve scripts
author: Yves Agostini - Univ Metz - <agostini at univ-metz.fr>
build_requires:
Pod::Coverage: 0
Test::More: 0
distribution_type: module
-generated_by: Module::Install version 0.64
+generated_by: Module::Install version 0.67
license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.3.html
+ version: 1.3
name: Net-Sieve-Script
no_index:
directory:
@@ -15,4 +19,4 @@
Class::Accessor::Fast: 0.3
perl: 5.6.0
tests: t/*.t
-version: 0.05
+version: 0.06
Modified: trunk/libnet-sieve-script-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/debian/changelog?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/debian/changelog (original)
+++ trunk/libnet-sieve-script-perl/debian/changelog Wed May 7 07:38:45 2008
@@ -1,5 +1,5 @@
-libnet-sieve-script-perl (0.05-1) unstable; urgency=low
+libnet-sieve-script-perl (0.06-1) unstable; urgency=low
* Initial Release. (Closes: #479568)
- -- AGOSTINI Yves <agostini at univ-metz.fr> Sat, 03 May 2008 21:16:03 +0200
+ -- AGOSTINI Yves <agostini at univ-metz.fr> Sat, 06 May 2008 21:16:03 +0200
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install.pm Wed May 7 07:38:45 2008
@@ -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.64';
+ $VERSION = '0.67';
}
# Whether or not inc::Module::Install is actually loaded, the
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/AutoInstall.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/AutoInstall.pm Wed May 7 07:38:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/Base.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/Base.pm Wed May 7 07:38:45 2008
@@ -1,7 +1,7 @@
#line 1
package Module::Install::Base;
-$VERSION = '0.64';
+$VERSION = '0.67';
# Suspend handler for "redefined" warnings
BEGIN {
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/Can.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/Can.pm Wed May 7 07:38:45 2008
@@ -11,7 +11,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/Fetch.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/Fetch.pm Wed May 7 07:38:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/Include.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/Include.pm Wed May 7 07:38:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/Makefile.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/Makefile.pm Wed May 7 07:38:45 2008
@@ -7,7 +7,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
@@ -17,192 +17,221 @@
my %seen = ();
sub prompt {
- shift;
-
- # Infinite loop protection
- my @c = caller();
- if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
- die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
- }
-
- # In automated testing, always use defaults
- if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
- local $ENV{PERL_MM_USE_DEFAULT} = 1;
- goto &ExtUtils::MakeMaker::prompt;
- } else {
- goto &ExtUtils::MakeMaker::prompt;
- }
+ shift;
+
+ # Infinite loop protection
+ my @c = caller();
+ if ( ++$seen{"$c[1]|$c[2]|$_[0]"} > 3 ) {
+ die "Caught an potential prompt infinite loop ($c[1]|$c[2]|$_[0])";
+ }
+
+ # In automated testing, always use defaults
+ if ( $ENV{AUTOMATED_TESTING} and ! $ENV{PERL_MM_USE_DEFAULT} ) {
+ local $ENV{PERL_MM_USE_DEFAULT} = 1;
+ goto &ExtUtils::MakeMaker::prompt;
+ } else {
+ goto &ExtUtils::MakeMaker::prompt;
+ }
}
sub makemaker_args {
- my $self = shift;
- my $args = ($self->{makemaker_args} ||= {});
- %$args = ( %$args, @_ ) if @_;
- $args;
+ my $self = shift;
+ my $args = ($self->{makemaker_args} ||= {});
+ %$args = ( %$args, @_ ) if @_;
+ $args;
}
# For mm args that take multiple space-seperated args,
# append an argument to the current list.
sub makemaker_append {
- my $self = shift;
- my $name = shift;
- my $args = $self->makemaker_args;
- $args->{name} = defined $args->{$name}
- ? join( ' ', $args->{name}, @_ )
- : join( ' ', @_ );
+ my $self = sShift;
+ my $name = shift;
+ my $args = $self->makemaker_args;
+ $args->{name} = defined $args->{$name}
+ ? join( ' ', $args->{name}, @_ )
+ : join( ' ', @_ );
}
sub build_subdirs {
- my $self = shift;
- my $subdirs = $self->makemaker_args->{DIR} ||= [];
- for my $subdir (@_) {
- push @$subdirs, $subdir;
- }
+ my $self = shift;
+ my $subdirs = $self->makemaker_args->{DIR} ||= [];
+ for my $subdir (@_) {
+ push @$subdirs, $subdir;
+ }
}
sub clean_files {
- my $self = shift;
- my $clean = $self->makemaker_args->{clean} ||= {};
- %$clean = (
- %$clean,
- FILES => join(' ', grep length, $clean->{FILES}, @_),
- );
+ my $self = shift;
+ my $clean = $self->makemaker_args->{clean} ||= {};
+ %$clean = (
+ %$clean,
+ FILES => join(' ', grep length, $clean->{FILES}, @_),
+ );
}
sub realclean_files {
- my $self = shift;
- my $realclean = $self->makemaker_args->{realclean} ||= {};
- %$realclean = (
- %$realclean,
- FILES => join(' ', grep length, $realclean->{FILES}, @_),
- );
+ my $self = shift;
+ my $realclean = $self->makemaker_args->{realclean} ||= {};
+ %$realclean = (
+ %$realclean,
+ FILES => join(' ', grep length, $realclean->{FILES}, @_),
+ );
}
sub libs {
- my $self = shift;
- my $libs = ref $_[0] ? shift : [ shift ];
- $self->makemaker_args( LIBS => $libs );
+ my $self = shift;
+ my $libs = ref $_[0] ? shift : [ shift ];
+ $self->makemaker_args( LIBS => $libs );
}
sub inc {
- my $self = shift;
- $self->makemaker_args( INC => shift );
+ my $self = shift;
+ $self->makemaker_args( INC => shift );
+}
+
+my %test_dir = ();
+
+sub _wanted_t {
+ /\.t$/ and -f $_ and $test_dir{$File::Find::dir} = 1;
+}
+
+sub tests_recursive {
+ my $self = shift;
+ if ( $self->tests ) {
+ die "tests_recursive will not work if tests are already defined";
+ }
+ my $dir = shift || 't';
+ unless ( -d $dir ) {
+ die "tests_recursive dir '$dir' does not exist";
+ }
+ require File::Find;
+ %test_dir = ();
+ File::Find::find( \&_wanted_t, $dir );
+ $self->tests( join ' ', map { "$_/*.t" } sort keys %test_dir );
}
sub write {
- my $self = shift;
- die "&Makefile->write() takes no arguments\n" if @_;
-
- my $args = $self->makemaker_args;
- $args->{DISTNAME} = $self->name;
- $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
- $args->{VERSION} = $self->version || $self->determine_VERSION($args);
- $args->{NAME} =~ s/-/::/g;
- if ( $self->tests ) {
- $args->{test} = { TESTS => $self->tests };
- }
- if ($] >= 5.005) {
- $args->{ABSTRACT} = $self->abstract;
- $args->{AUTHOR} = $self->author;
- }
- if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
- $args->{NO_META} = 1;
- }
- 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 { @$_ } map { @$_ } grep $_,
- ($self->build_requires, $self->requires) );
-
- # 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 $prereq->{$file};
- }
- }
-
- 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";
- }
-
- my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
- if ($self->admin->preop) {
- $args{dist} = $self->admin->preop;
- }
-
- my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
- $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
+ my $self = shift;
+ die "&Makefile->write() takes no arguments\n" if @_;
+
+ my $args = $self->makemaker_args;
+ $args->{DISTNAME} = $self->name;
+ $args->{NAME} = $self->module_name || $self->name || $self->determine_NAME($args);
+ $args->{VERSION} = $self->version || $self->determine_VERSION($args);
+ $args->{NAME} =~ s/-/::/g;
+ if ( $self->tests ) {
+ $args->{test} = { TESTS => $self->tests };
+ }
+ if ($] >= 5.005) {
+ $args->{ABSTRACT} = $self->abstract;
+ $args->{AUTHOR} = $self->author;
+ }
+ if ( eval($ExtUtils::MakeMaker::VERSION) >= 6.10 ) {
+ $args->{NO_META} = 1;
+ }
+ 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 { @$_ }
+ map { @$_ }
+ grep $_,
+ ($self->build_requires, $self->requires)
+ );
+
+ # 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 $prereq->{$file};
+ }
+ }
+
+ 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";
+ }
+
+ $args->{INSTALLDIRS} = $self->installdirs;
+
+ my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
+
+ my $user_preop = delete $args{dist}->{PREOP};
+ if (my $preop = $self->admin->preop($user_preop)) {
+ $args{dist} = $preop;
+ }
+
+ my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
+ $self->fix_up_makefile($mm->{FIRST_MAKEFILE} || 'Makefile');
}
sub fix_up_makefile {
- my $self = shift;
- my $makefile_name = shift;
- my $top_class = ref($self->_top) || '';
- my $top_version = $self->_top->VERSION || '';
-
- my $preamble = $self->preamble
- ? "# Preamble by $top_class $top_version\n"
- . $self->preamble
- : '';
- my $postamble = "# Postamble by $top_class $top_version\n"
- . ($self->postamble || '');
-
- local *MAKEFILE;
- open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- my $makefile = do { local $/; <MAKEFILE> };
- close MAKEFILE or die $!;
-
- $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
- $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
- $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
- $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
- $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
-
- # Module::Install will never be used to build the Core Perl
- # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
- # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
- $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
- #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
-
- # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
- $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
-
- # XXX - This is currently unused; not sure if it breaks other MM-users
- # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
-
- open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
- print MAKEFILE "$preamble$makefile$postamble" or die $!;
- close MAKEFILE or die $!;
-
- 1;
+ my $self = shift;
+ my $makefile_name = shift;
+ my $top_class = ref($self->_top) || '';
+ my $top_version = $self->_top->VERSION || '';
+
+ my $preamble = $self->preamble
+ ? "# Preamble by $top_class $top_version\n"
+ . $self->preamble
+ : '';
+ my $postamble = "# Postamble by $top_class $top_version\n"
+ . ($self->postamble || '');
+
+ local *MAKEFILE;
+ open MAKEFILE, "< $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ my $makefile = do { local $/; <MAKEFILE> };
+ close MAKEFILE or die $!;
+
+ $makefile =~ s/\b(test_harness\(\$\(TEST_VERBOSE\), )/$1'inc', /;
+ $makefile =~ s/( -I\$\(INST_ARCHLIB\))/ -Iinc$1/g;
+ $makefile =~ s/( "-I\$\(INST_LIB\)")/ "-Iinc"$1/g;
+ $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
+ $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
+
+ # Module::Install will never be used to build the Core Perl
+ # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+ # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+ $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+ #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+ # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+ $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
+
+ # XXX - This is currently unused; not sure if it breaks other MM-users
+ # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
+
+ open MAKEFILE, "> $makefile_name" or die "fix_up_makefile: Couldn't open $makefile_name: $!";
+ print MAKEFILE "$preamble$makefile$postamble" or die $!;
+ close MAKEFILE or die $!;
+
+ 1;
}
sub preamble {
- my ($self, $text) = @_;
- $self->{preamble} = $text . $self->{preamble} if defined $text;
- $self->{preamble};
+ my ($self, $text) = @_;
+ $self->{preamble} = $text . $self->{preamble} if defined $text;
+ $self->{preamble};
}
sub postamble {
- my ($self, $text) = @_;
- $self->{postamble} ||= $self->admin->postamble;
- $self->{postamble} .= $text if defined $text;
- $self->{postamble}
+ my ($self, $text) = @_;
+ $self->{postamble} ||= $self->admin->postamble;
+ $self->{postamble} .= $text if defined $text;
+ $self->{postamble}
}
1;
__END__
-#line 334
+#line 363
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/Metadata.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/Metadata.pm Wed May 7 07:38:45 2008
@@ -6,14 +6,14 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
my @scalar_keys = qw{
name module_name abstract author version license
- distribution_type perl_version tests
+ distribution_type perl_version tests installdirs
};
my @tuple_keys = qw{
@@ -56,9 +56,23 @@
};
}
+# configure_requires is currently a null-op
+sub configure_requires { 1 }
+
+# Aliases for build_requires that will have alternative
+# meanings in some future version of META.yml.
+sub test_requires { shift->build_requires(@_) }
+sub install_requires { shift->build_requires(@_) }
+
+# Aliases for installdirs options
+sub install_as_core { $_[0]->installdirs('perl') }
+sub install_as_cpan { $_[0]->installdirs('site') }
+sub install_as_site { $_[0]->installdirs('site') }
+sub install_as_vendor { $_[0]->installdirs('vendor') }
+
sub sign {
my $self = shift;
- return $self->{'values'}{'sign'} if defined wantarray and !@_;
+ return $self->{'values'}{'sign'} if defined wantarray and ! @_;
$self->{'values'}{'sign'} = ( @_ ? $_[0] : 1 );
return $self;
}
@@ -279,9 +293,11 @@
if (
$self->_slurp($file) =~ m/
- =head \d \s+
- (?:licen[cs]e|licensing|copyright|legal)\b
- (.*?)
+ (
+ =head \d \s+
+ (?:licen[cs]e|licensing|copyright|legal)\b
+ .*?
+ )
(=head\\d.*|=cut.*|)
\z
/ixms
@@ -289,19 +305,24 @@
{
my $license_text = $1;
my @phrases = (
- 'under the same (?:terms|license) as perl itself' => 'perl',
- 'GNU public license' => 'gpl',
- 'GNU lesser public license' => 'gpl',
- 'BSD license' => 'bsd',
- 'Artistic license' => 'artistic',
- 'GPL' => 'gpl',
- 'LGPL' => 'lgpl',
- 'BSD' => 'bsd',
- 'Artistic' => 'artistic',
+ 'under the same (?:terms|license) as perl itself' => 'perl', 1,
+ 'GNU public license' => 'gpl', 1,
+ 'GNU lesser public license' => 'gpl', 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 ) = splice( @phrases, 0, 2 ) ) {
+ while ( my ($pattern, $license, $osi) = splice(@phrases, 0, 3) ) {
$pattern =~ s{\s+}{\\s+}g;
if ( $license_text =~ /\b$pattern\b/i ) {
+ if ( $osi and $license_text =~ /All rights reserved/i ) {
+ warn "LEGAL WARNING: 'All rights reserved' may invalidate Open Source licenses. Consider removing it.";
+ }
$self->license($license);
return 1;
}
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/Win32.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/Win32.pm Wed May 7 07:38:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libnet-sieve-script-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/inc/Module/Install/WriteAll.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libnet-sieve-script-perl/inc/Module/Install/WriteAll.pm Wed May 7 07:38:45 2008
@@ -6,7 +6,7 @@
use vars qw{$VERSION $ISCORE @ISA};
BEGIN {
- $VERSION = '0.64';
+ $VERSION = '0.67';
$ISCORE = 1;
@ISA = qw{Module::Install::Base};
}
Modified: trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script.pm (original)
+++ trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script.pm Wed May 7 07:38:45 2008
@@ -1,11 +1,11 @@
package Net::Sieve::Script;
use strict;
-#use warnings;
+use warnings;
BEGIN {
use Exporter ();
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
- $VERSION = '0.05';
+ $VERSION = '0.06';
@ISA = qw(Exporter);
#Give a hoot don't pollute, do not export more than needed by default
@EXPORT = qw(_strip);
@@ -113,7 +113,7 @@
# break if more than 50 rules
die "50 rules does not sound reasonable !"
- if ( $self->max_priority() >= 50 );
+ if ( $self->max_priority() && $self->max_priority() >= 50 );
return $self;
}
@@ -150,7 +150,7 @@
foreach my $rule ( sort { $a->priority() <=> $b->priority() } @{$self->rules()} ) {
$text .= $rule->write."\n";
foreach my $req ($rule->require()) {
- $require{$req->[0]} = 1;
+ $require{$req->[0]} = 1 if defined $req->[0];
}
}
@@ -413,6 +413,8 @@
=head1 COPYRIGHT
+Copyright 2008 Yves Agostini - <agostini at univ-metz.fr>
+
This program is free software; you can redistribute
it and/or modify it under the same terms as Perl itself.
Modified: trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Action.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Action.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Action.pm (original)
+++ trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Action.pm Wed May 7 07:38:45 2008
@@ -1,12 +1,12 @@
package Net::Sieve::Script::Action;
use strict;
-#use warnings;
+use warnings;
use base qw(Class::Accessor::Fast);
use vars qw($VERSION);
-$VERSION = '0.0.5';
+$VERSION = '0.06';
__PACKAGE__->mk_accessors(qw(command param));
Modified: trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Condition.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Condition.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Condition.pm (original)
+++ trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Condition.pm Wed May 7 07:38:45 2008
@@ -1,12 +1,12 @@
package Net::Sieve::Script::Condition;
use strict;
-#use warnings;
+use warnings;
use base qw(Class::Accessor::Fast);
use vars qw($VERSION);
-$VERSION = '0.0.5';
+$VERSION = '0.06';
__PACKAGE__->mk_accessors(qw(test not id condition parent AllConds key_list header_list address_part match_type comparator require));
@@ -192,7 +192,7 @@
my $self = shift;
my $line = $self->not.' '.$self->test.' ';
- my $comparator = ':comparator '.$self->comparator if ($self->comparator);
+ my $comparator = ($self->comparator)?':comparator '.$self->comparator : '';
if ( $self->test eq 'address' ) {
$line .= $self->address_part.' '.$comparator.' '.$self->match_type;
@@ -213,7 +213,10 @@
};
- $line.=' '.$self->header_list.' '.$self->key_list;
+ my $header_list = ($self->header_list)?$self->header_list:'';
+ my $key_list = ($self->key_list)?$self->key_list:'';
+
+ $line.=' '.$header_list.' '.$key_list;
$line =~ s/^\s+//;
$line =~ s/\s+$//;
Modified: trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Rule.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Rule.pm?rev=19594&op=diff
==============================================================================
--- trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Rule.pm (original)
+++ trunk/libnet-sieve-script-perl/lib/Net/Sieve/Script/Rule.pm Wed May 7 07:38:45 2008
@@ -1,11 +1,11 @@
package Net::Sieve::Script::Rule;
use strict;
-#use warnings;
+use warnings;
use base qw(Class::Accessor::Fast);
use vars qw($VERSION);
-$VERSION = '0.0.5';
+$VERSION = '0.06';
use Net::Sieve::Script::Action;
use Net::Sieve::Script::Condition;
@@ -114,10 +114,13 @@
return $self->write_action;
}
- return $self->alternate.' '.
- $self->write_condition."\n".
+ my $write_condition = ($self->write_condition)?$self->write_condition:'';
+ my $write_action = ($self->write_action)?$self->write_action:'';
+
+ return $self->alternate.' '.
+ $write_condition."\n".
' {'.
- "\n".$self->write_action.
+ "\n".$write_action.
' } ';
}
@@ -154,7 +157,7 @@
{
my $self = shift;
- my $actions;
+ my $actions = '';
my $require = $self->require();
foreach my $command ( @{$self->actions()} ) {
More information about the Pkg-perl-cvs-commits
mailing list