This is an automated email from the git hooks/post-receive script.

dom pushed a commit to branch master
in repository libnet-ldap-filterbuilder-perl.git.

commit 4d949cff06fd21993793a4fa550b2ff697d3bcc4
Author: Dominic Hargreaves <d...@earth.li>
Date:   Sun Jun 13 20:04:22 2010 +0000

    new upstream
---
 Changes                        |  6 ++++++
 META.yml                       |  4 ++--
 README                         | 10 ++++-----
 debian/changelog               |  6 ++++++
 inc/Module/Install.pm          | 11 +++-------
 inc/Module/Install/Base.pm     |  2 +-
 inc/Module/Install/Can.pm      |  5 ++---
 inc/Module/Install/Fetch.pm    |  2 +-
 inc/Module/Install/Makefile.pm |  8 +++----
 inc/Module/Install/Metadata.pm | 15 +------------
 inc/Module/Install/Win32.pm    |  2 +-
 inc/Module/Install/WriteAll.pm |  2 +-
 lib/Net/LDAP/FilterBuilder.pm  |  8 +++----
 t/20-filter.t                  | 49 +++++++++++++++++++++---------------------
 14 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/Changes b/Changes
index b5f8562..a35f16d 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+libnet-ldap-filterbuilder (1.0004-1) UNRELEASED; urgency=low
+
+  * Fix for new Test::Simple which does not like stringification 
+
+ -- Oliver Gorwits <oliver.gorw...@oucs.ox.ac.uk>  Fri, 11 Jun 2010 15:36:46 
+0100
+
 libnet-ldap-filterbuilder (1.0003-1) UNRELEASED; urgency=low
 
   * Add docs patch from Tom Jones to expose as_str and other methods.
diff --git a/META.yml b/META.yml
index 1421404..e983f1e 100644
--- a/META.yml
+++ b/META.yml
@@ -7,7 +7,7 @@ build_requires:
   Test::Pod: 0
   Test::Pod::Coverage: 0
 distribution_type: module
-generated_by: 'Module::Install version 0.77'
+generated_by: 'Module::Install version 0.76'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,4 +22,4 @@ requires:
   perl: 5.8.1
 resources:
   license: http://dev.perl.org/licenses/
-version: 1.0003
+version: 1.0004
diff --git a/README b/README
index 9e4e2ae..6ff0b4b 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ NAME
     Net::LDAP::FilterBuilder - Build LDAP filter statements
 
 VERSION
-    This document refers to version 1.0003 of Net::LDAP::FilterBuilder
+    This document refers to version 1.0004 of Net::LDAP::FilterBuilder
 
 PURPOSE
     Use this module to construct LDAP filter statments which are compliant
@@ -20,11 +20,11 @@ SYNOPSIS
 
      $filter1->and( givenName => 'David' );
      # (&(sn=Jones)(givenName=David))
- 
-     my $filter2 = Net::LDAP::FilterBuilder->new( sn => [ 'Jones', 'Edwards', 
'Lewis' ] );
+     
+ my $filter2 = Net::LDAP::FilterBuilder->new( sn => [ 'Jones', 'Edwards', 
'Lewis' ] );
      # (|(sn=Jones)(sn=Edwards)(sn=Lewis))
- 
-     my $filter3 = Net::LDAP::FilterBuilder->new( givenName => 'David' )->not;
+     
+ my $filter3 = Net::LDAP::FilterBuilder->new( givenName => 'David' )->not;
      # (!(givenName=David))
 
     Build up filters incrementally from other FilterBuidler objects:
diff --git a/debian/changelog b/debian/changelog
index 5bd191b..a30b160 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libnet-ldap-filterbuilder-perl (1.0004-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Dominic Hargreaves <d...@earth.li>  Sun, 13 Jun 2010 21:03:27 +0100
+
 libnet-ldap-filterbuilder-perl (1.0003-1) unstable; urgency=low
 
   * New upstream release
diff --git a/inc/Module/Install.pm b/inc/Module/Install.pm
index eb449ca..87bed66 100644
--- a/inc/Module/Install.pm
+++ b/inc/Module/Install.pm
@@ -30,7 +30,7 @@ BEGIN {
        # 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 @@ sub autoload {
                        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 @@ sub _write {
        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+)\.?//;
diff --git a/inc/Module/Install/Base.pm b/inc/Module/Install/Base.pm
index 433ebed..76b32f8 100644
--- a/inc/Module/Install/Base.pm
+++ b/inc/Module/Install/Base.pm
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.77';
+$VERSION = '0.76';
 
 # Suspend handler for "redefined" warnings
 BEGIN {
diff --git a/inc/Module/Install/Can.pm b/inc/Module/Install/Can.pm
index 9025607..dd9a81c 100644
--- a/inc/Module/Install/Can.pm
+++ b/inc/Module/Install/Can.pm
@@ -11,7 +11,7 @@ use ExtUtils::MakeMaker ();
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-       $VERSION = '0.77';
+       $VERSION = '0.76';
        $ISCORE  = 1;
        @ISA     = qw{Module::Install::Base};
 }
@@ -39,7 +39,6 @@ sub can_run {
        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 @@ if ( $^O eq 'cygwin' ) {
 
 __END__
 
-#line 158
+#line 157
diff --git a/inc/Module/Install/Fetch.pm b/inc/Module/Install/Fetch.pm
index d66aba5..58df9ff 100644
--- a/inc/Module/Install/Fetch.pm
+++ b/inc/Module/Install/Fetch.pm
@@ -6,7 +6,7 @@ use Module::Install::Base;
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-       $VERSION = '0.77';
+       $VERSION = '0.76';
        $ISCORE  = 1;
        @ISA     = qw{Module::Install::Base};
 }
diff --git a/inc/Module/Install/Makefile.pm b/inc/Module/Install/Makefile.pm
index 92cd1ef..05af6ef 100644
--- a/inc/Module/Install/Makefile.pm
+++ b/inc/Module/Install/Makefile.pm
@@ -7,7 +7,7 @@ use ExtUtils::MakeMaker ();
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-       $VERSION = '0.77';
+       $VERSION = '0.76';
        $ISCORE  = 1;
        @ISA     = qw{Module::Install::Base};
 }
@@ -181,9 +181,7 @@ sub write {
 
        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 @@ sub postamble {
 
 __END__
 
-#line 379
+#line 377
diff --git a/inc/Module/Install/Metadata.pm b/inc/Module/Install/Metadata.pm
index 397fb97..90175f0 100644
--- a/inc/Module/Install/Metadata.pm
+++ b/inc/Module/Install/Metadata.pm
@@ -6,7 +6,7 @@ use Module::Install::Base;
 
 use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-       $VERSION = '0.77';
+       $VERSION = '0.76';
        $ISCORE  = 1;
        @ISA     = qw{Module::Install::Base};
 }
@@ -175,12 +175,6 @@ sub perl_version {
        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 ) {
@@ -219,9 +213,6 @@ sub all_from {
                        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.
        # If there is a matching .pod, use that instead
@@ -433,12 +424,8 @@ sub license_from {
                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,
diff --git a/inc/Module/Install/Win32.pm b/inc/Module/Install/Win32.pm
index cff76a2..f890074 100644
--- a/inc/Module/Install/Win32.pm
+++ b/inc/Module/Install/Win32.pm
@@ -6,7 +6,7 @@ use Module::Install::Base;
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '0.77';
+       $VERSION = '0.76';
        @ISA     = qw{Module::Install::Base};
        $ISCORE  = 1;
 }
diff --git a/inc/Module/Install/WriteAll.pm b/inc/Module/Install/WriteAll.pm
index f35620f..a50d31e 100644
--- a/inc/Module/Install/WriteAll.pm
+++ b/inc/Module/Install/WriteAll.pm
@@ -6,7 +6,7 @@ use Module::Install::Base;
 
 use vars qw{$VERSION @ISA $ISCORE};
 BEGIN {
-       $VERSION = '0.77';
+       $VERSION = '0.76';
        @ISA     = qw{Module::Install::Base};
        $ISCORE  = 1;
 }
diff --git a/lib/Net/LDAP/FilterBuilder.pm b/lib/Net/LDAP/FilterBuilder.pm
index 0f23a0c..3038ed2 100644
--- a/lib/Net/LDAP/FilterBuilder.pm
+++ b/lib/Net/LDAP/FilterBuilder.pm
@@ -1,7 +1,7 @@
 #
 # $HeadURL: 
https://svn.oucs.ox.ac.uk/people/oliver/pub/cpan/libnet-ldap-filterbuilder-perl/trunk/lib/Net/LDAP/FilterBuilder.pm
 $
-# $LastChangedRevision: 567 $
-# $LastChangedDate: 2009-10-20 08:27:24 +0100 (Tue, 20 Oct 2009) $
+# $LastChangedRevision: 767 $
+# $LastChangedDate: 2010-06-11 15:37:15 +0100 (Fri, 11 Jun 2010) $
 # $LastChangedBy: oliver $
 #
 package Net::LDAP::FilterBuilder;
@@ -9,7 +9,7 @@ package Net::LDAP::FilterBuilder;
 use strict;
 use warnings FATAL => 'all';
 
-our $VERSION = '1.0003';
+our $VERSION = '1.0004';
 $VERSION = eval $VERSION; # numify for warning-free dev releases
 
 use overload '""' => \&as_str;
@@ -102,7 +102,7 @@ Net::LDAP::FilterBuilder - Build LDAP filter statements
 
 =head1 VERSION
 
-This document refers to version 1.0003 of Net::LDAP::FilterBuilder
+This document refers to version 1.0004 of Net::LDAP::FilterBuilder
 
 =head1 PURPOSE
 
diff --git a/t/20-filter.t b/t/20-filter.t
index ee16929..d0078e1 100644
--- a/t/20-filter.t
+++ b/t/20-filter.t
@@ -8,39 +8,38 @@ BEGIN { use_ok('Net::LDAP::FilterBuilder') };
 # Insert your test code below, the Test::More module is use()ed here so read
 # its man page ( perldoc Test::More ) for help writing this test script.
 
-is( Net::LDAP::FilterBuilder->new( sn => 'Gorwits' ),
-    '(sn=Gorwits)'
- );
+my $f = Net::LDAP::FilterBuilder->new( sn => 'Gorwits' );
+is( "$f", '(sn=Gorwits)' );
 
-is( Net::LDAP::FilterBuilder->new( sn => [ 'Gorwits', 'Edwards', 'Morrell' ] ),
-    '(|(sn=Gorwits)(sn=Edwards)(sn=Morrell))' );
+$f = Net::LDAP::FilterBuilder->new( sn => [ 'Gorwits', 'Edwards', 'Morrell' ] 
);
+is( "$f", '(|(sn=Gorwits)(sn=Edwards)(sn=Morrell))' );
 
-is( Net::LDAP::FilterBuilder->new( sn => [ 'Gorwits', 'Edwards' ], givenName 
=> 'Guy' ),
-    '(&(|(sn=Gorwits)(sn=Edwards))(givenName=Guy))' );
+$f = Net::LDAP::FilterBuilder->new( sn => [ 'Gorwits', 'Edwards' ], givenName 
=> 'Guy' );
+is( "$f", '(&(|(sn=Gorwits)(sn=Edwards))(givenName=Guy))' );
 
-is( Net::LDAP::FilterBuilder->new( sn => [ 'Gorwits', 'Edwards' ] )->and( 
givenName => 'Oliver' ),
-    '(&(|(sn=Gorwits)(sn=Edwards))(givenName=Oliver))' );
+$f = Net::LDAP::FilterBuilder->new( sn => [ 'Gorwits', 'Edwards' ] )->and( 
givenName => 'Oliver' );
+is( "$f", '(&(|(sn=Gorwits)(sn=Edwards))(givenName=Oliver))' );
 
-is( Net::LDAP::FilterBuilder->new( sn => 'Gorwits' )->or( sn => 'Edwards' 
)->and( givenName => 'Oliver' ),
-    '(&(|(sn=Gorwits)(sn=Edwards))(givenName=Oliver))' );
+$f = Net::LDAP::FilterBuilder->new( sn => 'Gorwits' )->or( sn => 'Edwards' 
)->and( givenName => 'Oliver' );
+is( "$f", '(&(|(sn=Gorwits)(sn=Edwards))(givenName=Oliver))' );
 
-is( Net::LDAP::FilterBuilder->new( sn => 'Gorwits' )->or( 
Net::LDAP::FilterBuilder->new( sn => 'Edwards' )->and( givenName => 'Oliver' ) 
),
-    '(|(sn=Gorwits)(&(sn=Edwards)(givenName=Oliver)))' );
+$f = Net::LDAP::FilterBuilder->new( sn => 'Gorwits' )->or( 
Net::LDAP::FilterBuilder->new( sn => 'Edwards' )->and( givenName => 'Oliver' ) 
);
+is( "$f", '(|(sn=Gorwits)(&(sn=Edwards)(givenName=Oliver)))' );
 
-is( Net::LDAP::FilterBuilder->new( sn => 'Gorwits' )->or( sn => 'Edwards' 
)->and( givenName => 'Oliver' )->not,
-    '(!(&(|(sn=Gorwits)(sn=Edwards))(givenName=Oliver)))' );
+$f = Net::LDAP::FilterBuilder->new( sn => 'Gorwits' )->or( sn => 'Edwards' 
)->and( givenName => 'Oliver' )->not;
+is( "$f", '(!(&(|(sn=Gorwits)(sn=Edwards))(givenName=Oliver)))' );
 
-is( Net::LDAP::FilterBuilder->new( sn => ['Gorwits', 'Edwards'] )->and( 
Net::LDAP::FilterBuilder->new( givenName => 'Oliver' )->not ),
-    '(&(|(sn=Gorwits)(sn=Edwards))(!(givenName=Oliver)))' );
+$f = Net::LDAP::FilterBuilder->new( sn => ['Gorwits', 'Edwards'] )->and( 
Net::LDAP::FilterBuilder->new( givenName => 'Oliver' )->not );
+is( "$f", '(&(|(sn=Gorwits)(sn=Edwards))(!(givenName=Oliver)))' );
 
-is( Net::LDAP::FilterBuilder->new( sn => 'foo*bar' ),
-    '(sn=foo\*bar)' );
+$f = Net::LDAP::FilterBuilder->new( sn => 'foo*bar' );
+is( "$f", '(sn=foo\*bar)' );
 
-is( Net::LDAP::FilterBuilder->new( sn => \'foo*bar' ),
-    '(sn=foo*bar)' );
+$f = Net::LDAP::FilterBuilder->new( sn => \'foo*bar' );
+is( "$f", '(sn=foo*bar)' );
 
-is( Net::LDAP::FilterBuilder->new( sn => \'*' ),
-    '(sn=*)' );
+$f = Net::LDAP::FilterBuilder->new( sn => \'*' );
+is( "$f", '(sn=*)' );
 
-is( Net::LDAP::FilterBuilder->new( '>=', dateOfBirth => '19700101000000Z' ),
-    '(dateOfBirth>=19700101000000Z)' );
+$f = Net::LDAP::FilterBuilder->new( '>=', dateOfBirth => '19700101000000Z' );
+is( "$f", '(dateOfBirth>=19700101000000Z)' );

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libnet-ldap-filterbuilder-perl.git.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to