r3539 - in /packages/libversion-perl/trunk: Build.PL Changes MANIFEST.SKIP META.yml Makefile.PL README debian/changelog lib/version.pm t/coretests.pm vperl/vpp.pm vutil/lib/version/vxs.pm

eloy at users.alioth.debian.org eloy at users.alioth.debian.org
Tue Aug 29 12:38:19 UTC 2006


Author: eloy
Date: Tue Aug 29 12:38:19 2006
New Revision: 3539

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=3539
Log:
eloy: new upstream version

Modified:
    packages/libversion-perl/trunk/Build.PL
    packages/libversion-perl/trunk/Changes
    packages/libversion-perl/trunk/MANIFEST.SKIP
    packages/libversion-perl/trunk/META.yml
    packages/libversion-perl/trunk/Makefile.PL
    packages/libversion-perl/trunk/README
    packages/libversion-perl/trunk/debian/changelog
    packages/libversion-perl/trunk/lib/version.pm
    packages/libversion-perl/trunk/t/coretests.pm
    packages/libversion-perl/trunk/vperl/vpp.pm
    packages/libversion-perl/trunk/vutil/lib/version/vxs.pm

Modified: packages/libversion-perl/trunk/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/Build.PL?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/Build.PL (original)
+++ packages/libversion-perl/trunk/Build.PL Tue Aug 29 12:38:19 2006
@@ -5,7 +5,7 @@
 
 my $class = Module::Build->subclass
 (
-    class => 'version::Builder',
+#    class => 'version::Builder',
     code => q{
     sub ACTION_dist{
         my $self = shift;

Modified: packages/libversion-perl/trunk/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/Changes?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/Changes (original)
+++ packages/libversion-perl/trunk/Changes Tue Aug 29 12:38:19 2006
@@ -1,3 +1,29 @@
+2006-08-16  John Peacock <jpeacock at cpan.org>
+
+	Use default subclass name in Build.PL, since M::B nukes the version::
+	namespace during its own initialization.
+
+2006-08-08  John Peacock <jpeacock at cpan.org>
+
+	Revert accidental whitespace change
+
+2006-08-08  John Peacock <jpeacock at cpan.org>
+
+	One more regex to prevent patch files being added to MANIFEST
+
+2006-08-08  John Peacock <jpeacock at cpan.org>
+
+	Dependency on changelog not in correct order with dist
+
+2006-08-08  John Peacock <jpeacock at cpan.org>
+
+	Yet another way to structure Makefile.PL so that it autogenerates Changes.
+
+2006-08-08  John Peacock <jpeacock at cpan.org>
+
+	Once again, fix very small version handling in pure Perl release (globally
+	this time).
+
 2006-07-30  John Peacock <jpeacock at cpan.org>
 
 	Property change (don't need these to be executable).

Modified: packages/libversion-perl/trunk/MANIFEST.SKIP
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/MANIFEST.SKIP?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/MANIFEST.SKIP (original)
+++ packages/libversion-perl/trunk/MANIFEST.SKIP Tue Aug 29 12:38:19 2006
@@ -3,6 +3,7 @@
 .+\.diff
 .+\.bak
 .+~
+.+\.orig
 Makefile$
 version-.+\.tar\.gz
 vutil/Makefile\.PL

Modified: packages/libversion-perl/trunk/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/META.yml?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/META.yml (original)
+++ packages/libversion-perl/trunk/META.yml Tue Aug 29 12:38:19 2006
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         version
-version:      0.662
+version:      0.6701
 version_from: lib/version.pm
 installdirs:  site
 requires:

Modified: packages/libversion-perl/trunk/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/Makefile.PL?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/Makefile.PL (original)
+++ packages/libversion-perl/trunk/Makefile.PL Tue Aug 29 12:38:19 2006
@@ -57,9 +57,11 @@
 
                    clean           => { FILES => 'vutil/Makefile.PL' },
                    dist            => {
-                      PREOP  => (
+                       COMPRESS => 'gzip -9f', 
+                       SUFFIX => 'gz',
+                       PREOP  => (
                           'svk log -x | gnuify-changelog.pl > Changes'
-                      )
+                       ),
                    },
 
                  );
@@ -73,11 +75,11 @@
         $hash->{'PM'}->{'vperl/vpp.pm'} = '$(INST_LIBDIR)/version/vpp.pm';
     }
     else {
-	open MAKEFILE, '>vutil/Makefile.PL';
-	while (<DATA>) {
-	    print MAKEFILE $_;
-	}
-	close MAKEFILE;
+        open MAKEFILE, '>vutil/Makefile.PL';
+        while (<DATA>) {
+            print MAKEFILE $_;
+        }
+        close MAKEFILE;
         @{ $hash }{ 'DIR' } = ['vutil'];
     }
 

Modified: packages/libversion-perl/trunk/README
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/README?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/README (original)
+++ packages/libversion-perl/trunk/README Tue Aug 29 12:38:19 2006
@@ -1,4 +1,4 @@
-version 0.662
+version 0.6701
 ==================================
 
 Provides the same version objects as included in Perl v5.9.x (and hopefully in
@@ -10,26 +10,19 @@
 order to get the current changes (the CPAN release has no effect in
 bleadperl).
 
-Minor changes in 0.662 - 2006-07-30
+Minor changes in 0.6701 - 2006-08-16
 =====================================
-Special "Microsoft Visual C is Stupid" release.  Force the MSVC compiler to
-act rationally and not call the linker when not explicitely asked during
-the "manual search for a C compiler" phase of the compatibility
-Makefile.PL.  Also, make sure that Makefile.PL creates manified-POD's (like
-Build.PL already does automatically).  For an added bonus, augment the
-Makefile.PL to generate the Changes file automatically (again, to match
-what Build.PL already does), since Module::Release prefers to use
-Makefile.PL instead of Build.PL (something I may change).
 
-Major changes in 0.661 - 2006-07-25
+Another Build.PL tweak for Module::Build 0.2805, which nukes the version::
+namespace during the test for an installed release of version.pm.  This
+makes it impossible to install version.pm from CPAN with M::B.
+
+Major changes in 0.67 - 2006-08-08
 =====================================
-Reorganize structure and provide a fully EU::MM compatible Makefile.PL for, 
-among other cases, bootstrap installing of Module::Build (which now depends 
-on version.pm).  No new tests, no change to core code.  Resolves RT#20493.
-Now works if ExtUtils::CBuilder isn't installed.  Slight tweak of
-Makefile.PL to deal with Perl < v5.6.0.  Eliminate dependency of vpp.pm on
-Scalar::Util (to make it easier to embed it in Module::Build).  Rewrite
-Perl UNIVERSAL::VERSION to not throw undef warnings.
+
+Redo pure Perl code to correctly handle all instances of very small version
+objects (where Perl "helpfully" hands us exponential notation).
+
 
 Please read the POD documentation for usage/details.  See the CHANGES file
 for full details of all changes to the module behavior.
@@ -60,11 +53,11 @@
    $ make test
    # make install
 
-and 
+and correspondingly
 
    $ perl Makefile.PL --perl_only
 
-and it will install the Perl only version.
+will install the Perl only version.
   
 
 DEPENDENCIES

Modified: packages/libversion-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/debian/changelog?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/debian/changelog (original)
+++ packages/libversion-perl/trunk/debian/changelog Tue Aug 29 12:38:19 2006
@@ -1,3 +1,9 @@
+libversion-perl (0.6701-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>  Tue, 29 Aug 2006 14:35:18 +0200
+
 libversion-perl (0.662-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/libversion-perl/trunk/lib/version.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/lib/version.pm?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/lib/version.pm (original)
+++ packages/libversion-perl/trunk/lib/version.pm Tue Aug 29 12:38:19 2006
@@ -6,7 +6,7 @@
 
 use vars qw(@ISA $VERSION $CLASS *qv);
 
-$VERSION = 0.662;
+$VERSION = 0.6701;
 
 $CLASS = 'version';
 

Modified: packages/libversion-perl/trunk/t/coretests.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/t/coretests.pm?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/t/coretests.pm (original)
+++ packages/libversion-perl/trunk/t/coretests.pm Tue Aug 29 12:38:19 2006
@@ -288,7 +288,7 @@
 	eval "use lib '.'; use xxx; $version = xxx->VERSION";
 	unlike ($@, qr/$error_regex/,
 	    'Replacement handles modules without package or VERSION'); 
-	isnt (defined($version), "Called as class method");
+	ok (defined($version), "Called as class method");
 	unlink 'xxx.pm';
     }
     
@@ -371,6 +371,10 @@
     ok($version eq 'undef', "Undef version comparison #5");
     ok($version eq undef, "Undef version comparison #6");
 
+    $version = $CLASS->new(0.000001);
+    unlike($warning, qr/^Version string '1e-06' contains invalid data/,
+    	"Very small version objects");
+
 SKIP: {
 	# dummy up a legal module for testing RT#19017
 	open F, ">www.pm" or die "Cannot open www.pm: $!\n";
@@ -389,7 +393,7 @@
 	    "Comparing vs. version with no decimal"); 
 	eval "use lib '.'; use www 1.;";
 	like ($@, qr/^www version 1.000 \(v1.0.0\) required/,
-	    "Comparing "); 
+	    "Comparing vs. version with decimal only"); 
 
 	skip 'Cannot "use" extended versions with Perl < 5.6.2', 1
 	    if $] < 5.006_002;
@@ -398,7 +402,8 @@
 	    "Make sure very small versions don't freak"); 
 
 	eval "use lib '.'; use www 0.0.4;";
-	isnt ($@, 'This should succeed');
+	unlike($@, qr/^www version 0.000004 \(v0.0.4\) required/,
+	    'Succeed - required == VERSION');
 	cmp_ok ( "www"->VERSION, 'eq', '0.000004', 'No undef warnings' );
 
 	unlink 'www.pm';

Modified: packages/libversion-perl/trunk/vperl/vpp.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/vperl/vpp.pm?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/vperl/vpp.pm (original)
+++ packages/libversion-perl/trunk/vperl/vpp.pm Tue Aug 29 12:38:19 2006
@@ -4,7 +4,7 @@
 
 use Scalar::Util;
 use vars qw ($VERSION @ISA @REGEXS);
-$VERSION = 0.662;
+$VERSION = 0.6701;
 
 push @REGEXS, qr/
 	^v?	# optional leading 'v'
@@ -42,6 +42,12 @@
 		# must be a v-string
 		$value = $tvalue;
 	    }
+	}
+
+	# exponential notation
+	if ( $value =~ /\d+e-?\d+/ ) {
+	    $value = sprintf("%.9f",$value);
+	    $value =~ s/(0+)$//;
 	}
 	
 	# This is not very efficient, but it is morally equivalent
@@ -363,11 +369,6 @@
 sub qv {
     my ($value) = @_;
 
-    if ( $value =~ /\d+e-?\d+/ ) { # exponential notation
-	$value = sprintf("%.9f",$value);
-	$value =~ s/(0+)//;
-    }
-
     my $eval = eval 'Scalar::Util::isvstring($value)';
     if ( !$@ and $eval ) {
 	$value = sprintf("v%vd",$value);
@@ -409,10 +410,6 @@
 	}
 
 	if ( defined $req ) {
-	    if ( $req =~ /\d+e-?\d+/ ) { # exponential notation
-		$req = sprintf("%.9f",$req);
-		$req =~ s/(0+)$//;
-	    }
 	    unless ( defined $version ) {
 		my $msg =  "$class does not define ".
 			   "\$$class\::VERSION--version check failed";

Modified: packages/libversion-perl/trunk/vutil/lib/version/vxs.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libversion-perl/trunk/vutil/lib/version/vxs.pm?rev=3539&op=diff
==============================================================================
--- packages/libversion-perl/trunk/vutil/lib/version/vxs.pm (original)
+++ packages/libversion-perl/trunk/vutil/lib/version/vxs.pm Tue Aug 29 12:38:19 2006
@@ -9,7 +9,7 @@
 
 @ISA = qw(DynaLoader);
 
-$VERSION = 0.662;
+$VERSION = 0.6701;
 
 $CLASS = 'version::vxs';
 




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