r59219 - in /branches/upstream/libcpan-meta-perl/current: ./ lib/CPAN/ lib/CPAN/Meta/ t/data-bad/ t/data/

ansgar-guest at users.alioth.debian.org ansgar-guest at users.alioth.debian.org
Sat Jun 12 10:09:57 UTC 2010


Author: ansgar-guest
Date: Sat Jun 12 10:08:42 2010
New Revision: 59219

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59219
Log:
[svn-upgrade] new version libcpan-meta-perl (2.101610)

Added:
    branches/upstream/libcpan-meta-perl/current/t/data-bad/107650337-META.yml
    branches/upstream/libcpan-meta-perl/current/t/data-bad/restrictive-2.json
    branches/upstream/libcpan-meta-perl/current/t/data/restricted-2.json
    branches/upstream/libcpan-meta-perl/current/t/data/restrictive-1_4.yml
Modified:
    branches/upstream/libcpan-meta-perl/current/Changes
    branches/upstream/libcpan-meta-perl/current/MANIFEST
    branches/upstream/libcpan-meta-perl/current/META.json
    branches/upstream/libcpan-meta-perl/current/META.yml
    branches/upstream/libcpan-meta-perl/current/Makefile.PL
    branches/upstream/libcpan-meta-perl/current/README
    branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta.pm
    branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Converter.pm
    branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Feature.pm
    branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/History.pm
    branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Prereqs.pm
    branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Spec.pm
    branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Validator.pm

Modified: branches/upstream/libcpan-meta-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/Changes?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/Changes (original)
+++ branches/upstream/libcpan-meta-perl/current/Changes Sat Jun 12 10:08:42 2010
@@ -1,4 +1,18 @@
 Revision history for CPAN-Meta
+
+2.101610  2010-06-10 18:51:30 EST5EDT
+
+  - fixed converter bug that output 'artistic2' instead of 'artistic_2'
+    for license in 1.X specs
+
+  - 'artistic2' is now converted to 'artistic_2' if it occurs
+
+  - corrected validation for 'artistic_2' and disallowed 'artistic-2.0'
+
+2.101600  2010-06-09 10:07:31 EST5EDT
+
+  - improve conversion of restricted/restrictive license keys between
+    spec versions 1.4 and 2 [reported by Alexander Hartmaier]
 
 2.101591  2010-06-08 09:56:17 EST5EDT
 

Modified: branches/upstream/libcpan-meta-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/MANIFEST?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/MANIFEST (original)
+++ branches/upstream/libcpan-meta-perl/current/MANIFEST Sat Jun 12 10:08:42 2010
@@ -22,6 +22,7 @@
 t/converter-bad.t
 t/converter-fail.t
 t/converter.t
+t/data-bad/107650337-META.yml
 t/data-bad/1122575719-META.yml
 t/data-bad/1206545041-META.yml
 t/data-bad/1598804075-META.yml
@@ -40,6 +41,7 @@
 t/data-bad/META-1_3.yml
 t/data-bad/META-1_4.yml
 t/data-bad/META-2.json
+t/data-bad/restrictive-2.json
 t/data-fail/META-1_0.yml
 t/data-fail/META-1_1.yml
 t/data-fail/META-1_2.yml
@@ -52,6 +54,8 @@
 t/data/META-1_3.yml
 t/data/META-1_4.yml
 t/data/META-2.json
+t/data/restricted-2.json
+t/data/restrictive-1_4.yml
 t/load-bad.t
 t/meta-obj.t
 t/no-index.t

Modified: branches/upstream/libcpan-meta-perl/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/META.json?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/META.json (original)
+++ branches/upstream/libcpan-meta-perl/current/META.json Sat Jun 12 10:08:42 2010
@@ -5,7 +5,7 @@
       "Ricardo Signes <rjbs at cpan.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.101540, CPAN::Meta::Converter version 2.101590",
+   "generated_by" : "Dist::Zilla version 4.101582, CPAN::Meta::Converter version 2.101590",
    "license" : [
       "perl_5"
    ],
@@ -56,13 +56,13 @@
          "web" : "http://github.com/dagolden/cpan-meta"
       }
    },
-   "version" : "2.101591",
+   "version" : "2.101610",
    "x_Dist_Zilla" : {
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::MetaNoIndex",
             "name" : "MetaNoIndex",
-            "version" : "0.0200"
+            "version" : "1.101550"
          },
          {
             "class" : "Dist::Zilla::Plugin::CheckExtraTests",
@@ -77,97 +77,97 @@
          {
             "class" : "Dist::Zilla::Plugin::GatherDir",
             "name" : "@Filter/@Basic/GatherDir",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::PruneCruft",
             "name" : "@Filter/@Basic/PruneCruft",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@Filter/@Basic/ManifestSkip",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaYAML",
             "name" : "@Filter/@Basic/MetaYAML",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@Filter/@Basic/License",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::Readme",
             "name" : "@Filter/@Basic/Readme",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::ExecDir",
             "name" : "@Filter/@Basic/ExecDir",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::ShareDir",
             "name" : "@Filter/@Basic/ShareDir",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::MakeMaker",
             "name" : "@Filter/@Basic/MakeMaker",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::Manifest",
             "name" : "@Filter/@Basic/Manifest",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::TestRelease",
             "name" : "@Filter/@Basic/TestRelease",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::ConfirmRelease",
             "name" : "@Filter/@Basic/ConfirmRelease",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@Filter/@Basic/UploadToCPAN",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoPrereq",
             "name" : "@Filter/AutoPrereq",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::PkgVersion",
             "name" : "@Filter/PkgVersion",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@Filter/MetaConfig",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@Filter/MetaJSON",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::NextRelease",
             "name" : "@Filter/NextRelease",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@Filter/PodSyntaxTests",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::Repository",
@@ -202,7 +202,7 @@
          {
             "class" : "Dist::Zilla::Plugin::AutoVersion",
             "name" : "AutoVersion",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Push",
@@ -212,27 +212,27 @@
          {
             "class" : "Dist::Zilla::Plugin::MetaResources",
             "name" : "MetaResources",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "4.101540"
+            "version" : "4.101582"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "4.101540"
+            "version" : "4.101582"
          }
       ],
       "zilla" : {
@@ -240,7 +240,7 @@
          "config" : {
             "is_trial" : 0
          },
-         "version" : "4.101540"
+         "version" : "4.101582"
       }
    }
 }

Modified: branches/upstream/libcpan-meta-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/META.yml?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/META.yml (original)
+++ branches/upstream/libcpan-meta-perl/current/META.yml Sat Jun 12 10:08:42 2010
@@ -12,7 +12,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.31
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.101540, CPAN::Meta::Converter version 2.101590'
+generated_by: 'Dist::Zilla version 4.101582, CPAN::Meta::Converter version 2.101590'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -33,13 +33,13 @@
   version: 0.82
 resources:
   repository: http://github.com/dagolden/cpan-meta.git
-version: 2.101591
+version: 2.101610
 x_Dist_Zilla:
   plugins:
     -
       class: Dist::Zilla::Plugin::MetaNoIndex
       name: MetaNoIndex
-      version: 0.0200
+      version: 1.101550
     -
       class: Dist::Zilla::Plugin::CheckExtraTests
       name: CheckExtraTests
@@ -51,79 +51,79 @@
     -
       class: Dist::Zilla::Plugin::GatherDir
       name: '@Filter/@Basic/GatherDir'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::PruneCruft
       name: '@Filter/@Basic/PruneCruft'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::ManifestSkip
       name: '@Filter/@Basic/ManifestSkip'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::MetaYAML
       name: '@Filter/@Basic/MetaYAML'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::License
       name: '@Filter/@Basic/License'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::Readme
       name: '@Filter/@Basic/Readme'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::ExecDir
       name: '@Filter/@Basic/ExecDir'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::ShareDir
       name: '@Filter/@Basic/ShareDir'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::MakeMaker
       name: '@Filter/@Basic/MakeMaker'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::Manifest
       name: '@Filter/@Basic/Manifest'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::TestRelease
       name: '@Filter/@Basic/TestRelease'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::ConfirmRelease
       name: '@Filter/@Basic/ConfirmRelease'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::UploadToCPAN
       name: '@Filter/@Basic/UploadToCPAN'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::AutoPrereq
       name: '@Filter/AutoPrereq'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::PkgVersion
       name: '@Filter/PkgVersion'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::MetaConfig
       name: '@Filter/MetaConfig'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::MetaJSON
       name: '@Filter/MetaJSON'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::NextRelease
       name: '@Filter/NextRelease'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::PodSyntaxTests
       name: '@Filter/PodSyntaxTests'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::Repository
       name: '@Filter/Repository'
@@ -151,7 +151,7 @@
     -
       class: Dist::Zilla::Plugin::AutoVersion
       name: AutoVersion
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::Git::Push
       name: Git::Push
@@ -159,25 +159,25 @@
     -
       class: Dist::Zilla::Plugin::MetaResources
       name: MetaResources
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':InstallModules'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':TestFiles'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ExecFiles'
-      version: 4.101540
+      version: 4.101582
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ShareFiles'
-      version: 4.101540
+      version: 4.101582
   zilla:
     class: Dist::Zilla
     config:
       is_trial: 0
-    version: 4.101540
+    version: 4.101582

Modified: branches/upstream/libcpan-meta-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/Makefile.PL?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/Makefile.PL (original)
+++ branches/upstream/libcpan-meta-perl/current/Makefile.PL Sat Jun 12 10:08:42 2010
@@ -35,7 +35,7 @@
     'autodie' => '0',
     'version' => '0.82'
   },
-  'VERSION' => '2.101591',
+  'VERSION' => '2.101610',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: branches/upstream/libcpan-meta-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/README?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/README (original)
+++ branches/upstream/libcpan-meta-perl/current/README Sat Jun 12 10:08:42 2010
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution CPAN-Meta,
-version 2.101591:
+version 2.101610:
 
   the distribution metadata for a CPAN dist
 

Modified: branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta.pm?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta.pm (original)
+++ branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta.pm Sat Jun 12 10:08:42 2010
@@ -4,7 +4,7 @@
 use autodie;
 package CPAN::Meta;
 BEGIN {
-  $CPAN::Meta::VERSION = '2.101591';
+  $CPAN::Meta::VERSION = '2.101610';
 }
 # ABSTRACT: the distribution metadata for a CPAN dist
 
@@ -314,7 +314,7 @@
 
 =head1 VERSION
 
-version 2.101591
+version 2.101610
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Converter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Converter.pm?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Converter.pm (original)
+++ branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Converter.pm Sat Jun 12 10:08:42 2010
@@ -4,7 +4,7 @@
 use autodie;
 package CPAN::Meta::Converter;
 BEGIN {
-  $CPAN::Meta::Converter::VERSION = '2.101591';
+  $CPAN::Meta::Converter::VERSION = '2.101610';
 }
 # ABSTRACT: Convert CPAN distribution metadata structures
 
@@ -79,8 +79,7 @@
   'gpl',
   'apache',
   'artistic',
-  'artistic2',
-  'artistic-2.0',
+  'artistic_2',
   'lgpl',
   'bsd',
   'gpl',
@@ -92,13 +91,16 @@
   'unknown',
 );
 
-my %license_map_1 = ( map { $_ => 1 } @valid_licenses_1 );
+my %license_map_1 = (
+  ( map { $_ => $_ } @valid_licenses_1 ),
+  artistic2 => 'artistic_2',
+);
 
 sub _license_1 {
   my ($element) = @_;
   return 'unknown' unless defined $element;
   if ( $license_map_1{lc $element} ) {
-    return lc $element;
+    return $license_map_1{lc $element};
   }
   return 'unknown';
 }
@@ -137,10 +139,12 @@
   ( map { $_ => $_ } @valid_licenses_2 ),
   apache => 'apache_2_0',
   artistic => 'artistic_1',
+  artistic2 => 'artistic_2',
   gpl => 'gpl_1',
   lgpl => 'lgpl_2_1',
   mozilla => 'mozilla_1_0',
   perl => 'perl_5',
+  restrictive => 'restricted',
 );
 
 sub _license_2 {
@@ -162,7 +166,7 @@
   apache_1_1        apache
   apache_2_0        apache
   artistic_1        artistic
-  artistic_2        artistic2
+  artistic_2        artistic_2
   bsd               bsd
   freebsd           open_source
   gfdl_1_2          open_source
@@ -182,7 +186,7 @@
   sun               open_source
   zlib              open_source
   open_source       open_source
-  restricted        restricted
+  restricted        restrictive
   unrestricted      unrestricted
   unknown           unknown
 );
@@ -194,18 +198,13 @@
   }
   elsif( ref $element eq 'ARRAY' ) {
     if ( @$element == 1 ) {
-      return $license_downgrade_map{$element->[0]};
+      return $license_downgrade_map{$element->[0]} || "unknown";
     }
-    else {
-      return 'unknown';
-    }
   }
   elsif ( ! ref $element ) {
-    return $license_downgrade_map{$element};
-  }
-  else {
-    return "unknown";
-  }
+    return $license_downgrade_map{$element} || "unknown";
+  }
+  return "unknown";
 }
 
 my $no_index_spec_1_2 = {
@@ -1243,7 +1242,7 @@
 
 =head1 VERSION
 
-version 2.101591
+version 2.101610
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Feature.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Feature.pm?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Feature.pm (original)
+++ branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Feature.pm Sat Jun 12 10:08:42 2010
@@ -4,7 +4,7 @@
 use autodie;
 package CPAN::Meta::Feature;
 BEGIN {
-  $CPAN::Meta::Feature::VERSION = '2.101591';
+  $CPAN::Meta::Feature::VERSION = '2.101610';
 }
 # ABSTRACT: an optional feature provided by a CPAN distribution
 
@@ -44,7 +44,7 @@
 
 =head1 VERSION
 
-version 2.101591
+version 2.101610
 
 =head1 DESCRIPTION
 

Modified: branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/History.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/History.pm?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/History.pm (original)
+++ branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/History.pm Sat Jun 12 10:08:42 2010
@@ -5,7 +5,7 @@
 use autodie;
 package CPAN::Meta::History;
 BEGIN {
-  $CPAN::Meta::History::VERSION = '2.101591';
+  $CPAN::Meta::History::VERSION = '2.101610';
 }
 # ABSTRACT: history of CPAN Meta Spec changes
 1;
@@ -21,7 +21,7 @@
 
 =head1 VERSION
 
-version 2.101591
+version 2.101610
 
 =head1 DESCRIPTION
 

Modified: branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Prereqs.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Prereqs.pm?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Prereqs.pm (original)
+++ branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Prereqs.pm Sat Jun 12 10:08:42 2010
@@ -4,7 +4,7 @@
 use autodie;
 package CPAN::Meta::Prereqs;
 BEGIN {
-  $CPAN::Meta::Prereqs::VERSION = '2.101591';
+  $CPAN::Meta::Prereqs::VERSION = '2.101610';
 }
 # ABSTRACT: a set of distribution prerequisites by phase and type
 
@@ -151,7 +151,7 @@
 
 =head1 VERSION
 
-version 2.101591
+version 2.101610
 
 =head1 DESCRIPTION
 

Modified: branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Spec.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Spec.pm?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Spec.pm (original)
+++ branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Spec.pm Sat Jun 12 10:08:42 2010
@@ -5,7 +5,7 @@
 use autodie;
 package CPAN::Meta::Spec;
 BEGIN {
-  $CPAN::Meta::Spec::VERSION = '2.101591';
+  $CPAN::Meta::Spec::VERSION = '2.101610';
 }
 # ABSTRACT: specification for CPAN distribution metadata
 1;
@@ -21,7 +21,7 @@
 
 =head1 VERSION
 
-version 2.101591
+version 2.101610
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Validator.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Validator.pm?rev=59219&op=diff
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Validator.pm (original)
+++ branches/upstream/libcpan-meta-perl/current/lib/CPAN/Meta/Validator.pm Sat Jun 12 10:08:42 2010
@@ -4,7 +4,7 @@
 use autodie;
 package CPAN::Meta::Validator;
 BEGIN {
-  $CPAN::Meta::Validator::VERSION = '2.101591';
+  $CPAN::Meta::Validator::VERSION = '2.101610';
 }
 # ABSTRACT: validate CPAN distribution metadata structures
 
@@ -692,8 +692,7 @@
     'gpl'          => 'http://www.opensource.org/licenses/gpl-license.php',
     'apache'       => 'http://apache.org/licenses/LICENSE-2.0',
     'artistic'     => 'http://opensource.org/licenses/artistic-license.php',
-    'artistic2'    => 'http://opensource.org/licenses/artistic-license-2.0.php',
-    'artistic-2.0' => 'http://opensource.org/licenses/artistic-license-2.0.php',
+    'artistic_2'   => 'http://opensource.org/licenses/artistic-license-2.0.php',
     'lgpl'         => 'http://www.opensource.org/licenses/lgpl-license.phpt',
     'bsd'          => 'http://www.opensource.org/licenses/bsd-license.php',
     'gpl'          => 'http://www.opensource.org/licenses/gpl-license.php',
@@ -841,7 +840,7 @@
 
 =head1 VERSION
 
-version 2.101591
+version 2.101610
 
 =head1 SYNOPSIS
 

Added: branches/upstream/libcpan-meta-perl/current/t/data-bad/107650337-META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/t/data-bad/107650337-META.yml?rev=59219&op=file
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/t/data-bad/107650337-META.yml (added)
+++ branches/upstream/libcpan-meta-perl/current/t/data-bad/107650337-META.yml Sat Jun 12 10:08:42 2010
@@ -1,0 +1,25 @@
+---
+name: FabForce-DBDesigner4-DBIC
+version: 0.0802
+author:
+  - 'Renee Baecker <module at renee-baecker.de>'
+abstract: create DBIC scheme for DBDesigner4 xml file
+license: artistic2
+requires:
+  FabForce::DBDesigner4: 0.3
+  File::Spec: 3.12
+build_requires:
+  Carp: 0
+  Test::CheckManifest: 1
+  Test::More: 0
+generated_by: Module::Build version 0.2808
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.2.html
+  version: 1.2
+provides:
+  FabForce::DBDesigner4::DBIC:
+    file: lib/FabForce/DBDesigner4/DBIC.pm
+    version: 0.0802
+resources:
+  license: http://dev.perl.org/licenses/
+

Added: branches/upstream/libcpan-meta-perl/current/t/data-bad/restrictive-2.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/t/data-bad/restrictive-2.json?rev=59219&op=file
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/t/data-bad/restrictive-2.json (added)
+++ branches/upstream/libcpan-meta-perl/current/t/data-bad/restrictive-2.json Sat Jun 12 10:08:42 2010
@@ -1,0 +1,89 @@
+{
+   "resources" : {
+      "license" : [
+         "http://dev.perl.org/licenses/"
+      ],
+      "repository" : {
+        "url" : "svn://repo.example.com/foo-bar#fakeanchor",
+        "web" : "http://www.example.com"
+      }
+   },
+   "generated_by" : "Module::Build version 0.36",
+   "meta-spec" : {
+      "version" : "2",
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec"
+   },
+   "version" : "0.36",
+   "name" : "Module-Build",
+   "dynamic_config" : 1,
+   "author" : [
+      "Ken Williams <kwilliams at cpan.org>",
+      "Module-Build List <module-build at perl.org>"
+   ],
+   "release_status" : "stable",
+   "license" : [
+      "restrictive"
+   ],
+   "description" : "Module::Build is a system for building, testing, and installing Perl modules.  It is meant to be an alternative to ExtUtils::MakeMaker... blah blah blah",
+   "keywords" : [
+      "toolchain",
+      "cpan",
+      "dual-life"
+   ],
+   "prereqs" : {
+      "runtime" : {
+         "requires" : {
+            "File::Copy" : "0",
+            "IO::File" : "0",
+            "Data::Dumper" : "0",
+            "File::Spec" : "0",
+            "Config" : "0",
+            "ExtUtils::Install" : "0",
+            "perl" : "5.006",
+            "File::Compare" : "0",
+            "File::Find" : "0",
+            "File::Path" : "0",
+            "File::Basename" : "0",
+            "Cwd" : "0"
+         },
+         "recommends" : {
+            "YAML" : "0.35",
+            "ExtUtils::ParseXS" : "2.02",
+            "Pod::Text" : "0",
+            "ExtUtils::Install" : "0.3",
+            "Archive::Tar" : "1.00"
+         }
+      },
+      "build" : {
+         "requires" : {
+            "Build::Requires": "1.1",
+            "Test::More" : "0"
+         }
+      },
+      "test" : {
+         "requires" : {
+            "Test::More" : "0.88",
+            "Test::Requires" : "1.2"
+         }
+      }
+   },
+   "optional_features" : {
+      "domination" : {
+         "prereqs" : {
+            "develop" : {
+               "requires" : {
+                  "Genius::Evil" : "1.234"
+               }
+            },
+            "runtime" : {
+               "requires" : {
+                  "Machine::Weather" : "2.0"
+               }
+            }
+         },
+         "description" : "Take over the world"
+      }
+   },
+   "abstract" : "Build and install Perl modules",
+   "x_whatever" : "Custom key"
+}

Added: branches/upstream/libcpan-meta-perl/current/t/data/restricted-2.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/t/data/restricted-2.json?rev=59219&op=file
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/t/data/restricted-2.json (added)
+++ branches/upstream/libcpan-meta-perl/current/t/data/restricted-2.json Sat Jun 12 10:08:42 2010
@@ -1,0 +1,89 @@
+{
+   "resources" : {
+      "license" : [
+         "http://dev.perl.org/licenses/"
+      ],
+      "repository" : {
+        "url" : "svn://repo.example.com/foo-bar#fakeanchor",
+        "web" : "http://www.example.com"
+      }
+   },
+   "generated_by" : "Module::Build version 0.36",
+   "meta-spec" : {
+      "version" : "2",
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec"
+   },
+   "version" : "0.36",
+   "name" : "Module-Build",
+   "dynamic_config" : 1,
+   "author" : [
+      "Ken Williams <kwilliams at cpan.org>",
+      "Module-Build List <module-build at perl.org>"
+   ],
+   "release_status" : "stable",
+   "license" : [
+      "restricted"
+   ],
+   "description" : "Module::Build is a system for building, testing, and installing Perl modules.  It is meant to be an alternative to ExtUtils::MakeMaker... blah blah blah",
+   "keywords" : [
+      "toolchain",
+      "cpan",
+      "dual-life"
+   ],
+   "prereqs" : {
+      "runtime" : {
+         "requires" : {
+            "File::Copy" : "0",
+            "IO::File" : "0",
+            "Data::Dumper" : "0",
+            "File::Spec" : "0",
+            "Config" : "0",
+            "ExtUtils::Install" : "0",
+            "perl" : "5.006",
+            "File::Compare" : "0",
+            "File::Find" : "0",
+            "File::Path" : "0",
+            "File::Basename" : "0",
+            "Cwd" : "0"
+         },
+         "recommends" : {
+            "YAML" : "0.35",
+            "ExtUtils::ParseXS" : "2.02",
+            "Pod::Text" : "0",
+            "ExtUtils::Install" : "0.3",
+            "Archive::Tar" : "1.00"
+         }
+      },
+      "build" : {
+         "requires" : {
+            "Build::Requires": "1.1",
+            "Test::More" : "0"
+         }
+      },
+      "test" : {
+         "requires" : {
+            "Test::More" : "0.88",
+            "Test::Requires" : "1.2"
+         }
+      }
+   },
+   "optional_features" : {
+      "domination" : {
+         "prereqs" : {
+            "develop" : {
+               "requires" : {
+                  "Genius::Evil" : "1.234"
+               }
+            },
+            "runtime" : {
+               "requires" : {
+                  "Machine::Weather" : "2.0"
+               }
+            }
+         },
+         "description" : "Take over the world"
+      }
+   },
+   "abstract" : "Build and install Perl modules",
+   "x_whatever" : "Custom key"
+}

Added: branches/upstream/libcpan-meta-perl/current/t/data/restrictive-1_4.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libcpan-meta-perl/current/t/data/restrictive-1_4.yml?rev=59219&op=file
==============================================================================
--- branches/upstream/libcpan-meta-perl/current/t/data/restrictive-1_4.yml (added)
+++ branches/upstream/libcpan-meta-perl/current/t/data/restrictive-1_4.yml Sat Jun 12 10:08:42 2010
@@ -1,0 +1,132 @@
+---
+abstract: 'Build and install Perl modules'
+author:
+  - 'Ken Williams <kwilliams at cpan.org>'
+  - "Development questions, bug reports, and patches should be sent to the\nModule-Build mailing list at <module-build at perl.org>."
+build_requires:
+  File::Temp: 0.15
+  Test::Harness: 3.16
+  Test::More: 0.49
+generated_by: 'Module::Build version 0.3608'
+license: restrictive
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: Module-Build
+provides:
+  Module::Build:
+    file: lib/Module/Build.pm
+    version: 0.36_08
+  Module::Build::Base:
+    file: lib/Module/Build/Base.pm
+    version: 0.36_08
+  Module::Build::Compat:
+    file: lib/Module/Build/Compat.pm
+    version: 0.36_08
+  Module::Build::Config:
+    file: lib/Module/Build/Config.pm
+    version: 0.36_08
+  Module::Build::Cookbook:
+    file: lib/Module/Build/Cookbook.pm
+    version: 0.36_08
+  Module::Build::Dumper:
+    file: lib/Module/Build/Dumper.pm
+    version: 0.36_08
+  Module::Build::ModuleInfo:
+    file: lib/Module/Build/ModuleInfo.pm
+    version: 0.36_08
+  Module::Build::Notes:
+    file: lib/Module/Build/Notes.pm
+    version: 0.36_08
+  Module::Build::PPMMaker:
+    file: lib/Module/Build/PPMMaker.pm
+    version: 0.36_08
+  Module::Build::Platform::Amiga:
+    file: lib/Module/Build/Platform/Amiga.pm
+    version: 0.36_08
+  Module::Build::Platform::Default:
+    file: lib/Module/Build/Platform/Default.pm
+    version: 0.36_08
+  Module::Build::Platform::EBCDIC:
+    file: lib/Module/Build/Platform/EBCDIC.pm
+    version: 0.36_08
+  Module::Build::Platform::MPEiX:
+    file: lib/Module/Build/Platform/MPEiX.pm
+    version: 0.36_08
+  Module::Build::Platform::MacOS:
+    file: lib/Module/Build/Platform/MacOS.pm
+    version: 0.36_08
+  Module::Build::Platform::RiscOS:
+    file: lib/Module/Build/Platform/RiscOS.pm
+    version: 0.36_08
+  Module::Build::Platform::Unix:
+    file: lib/Module/Build/Platform/Unix.pm
+    version: 0.36_08
+  Module::Build::Platform::VMS:
+    file: lib/Module/Build/Platform/VMS.pm
+    version: 0.36_08
+  Module::Build::Platform::VOS:
+    file: lib/Module/Build/Platform/VOS.pm
+    version: 0.36_08
+  Module::Build::Platform::Windows:
+    file: lib/Module/Build/Platform/Windows.pm
+    version: 0.36_08
+  Module::Build::Platform::aix:
+    file: lib/Module/Build/Platform/aix.pm
+    version: 0.36_08
+  Module::Build::Platform::cygwin:
+    file: lib/Module/Build/Platform/cygwin.pm
+    version: 0.36_08
+  Module::Build::Platform::darwin:
+    file: lib/Module/Build/Platform/darwin.pm
+    version: 0.36_08
+  Module::Build::Platform::os2:
+    file: lib/Module/Build/Platform/os2.pm
+    version: 0.36_08
+  Module::Build::PodParser:
+    file: lib/Module/Build/PodParser.pm
+    version: 0.36_08
+  Module::Build::Version:
+    file: lib/Module/Build/Version.pm
+    version: 0.77
+  Module::Build::YAML:
+    file: lib/Module/Build/YAML.pm
+    version: 1.40
+  inc::latest:
+    file: lib/inc/latest.pm
+    version: 0.36_08
+  inc::latest::private:
+    file: lib/inc/latest/private.pm
+    version: 0.36_08
+recommends:
+  ExtUtils::Install: 0.3
+  ExtUtils::Manifest: 1.54
+  version: 0.74
+requires:
+  Cwd: 0
+  Data::Dumper: 0
+  ExtUtils::CBuilder: 0.27
+  ExtUtils::Install: 0
+  ExtUtils::Manifest: 0
+  ExtUtils::Mkbootstrap: 0
+  ExtUtils::ParseXS: 2.21
+  File::Basename: 0
+  File::Compare: 0
+  File::Copy: 0
+  File::Find: 0
+  File::Path: 0
+  File::Spec: 0.82
+  Getopt::Long: 0
+  IO::File: 0
+  Test::Harness: 0
+  Text::Abbrev: 0
+  Text::ParseWords: 0
+  perl: 5.006001
+resources:
+  MailingList: mailto:module-build at perl.org
+  license: http://dev.perl.org/licenses/
+  repository: http://github.com/dagolden/module-build/
+version: 0.36_08
+x-whatever: this is a custom field
+x_whatelse: so is this
+XWhatNow: and this




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