r72147 - in /trunk/libcpan-meta-perl: ./ debian/ lib/CPAN/ lib/CPAN/Meta/ t/ t/data/

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Sat Apr 2 14:19:30 UTC 2011


Author: periapt-guest
Date: Sat Apr  2 14:19:21 2011
New Revision: 72147

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=72147
Log:
* New upstream release
* Updated copyright

Added:
    trunk/libcpan-meta-perl/t/data/gpl-1_4.yml
      - copied unchanged from r72146, branches/upstream/libcpan-meta-perl/current/t/data/gpl-1_4.yml
Modified:
    trunk/libcpan-meta-perl/Changes
    trunk/libcpan-meta-perl/MANIFEST
    trunk/libcpan-meta-perl/META.json
    trunk/libcpan-meta-perl/META.yml
    trunk/libcpan-meta-perl/Makefile.PL
    trunk/libcpan-meta-perl/README
    trunk/libcpan-meta-perl/debian/changelog
    trunk/libcpan-meta-perl/debian/copyright
    trunk/libcpan-meta-perl/lib/CPAN/Meta.pm
    trunk/libcpan-meta-perl/lib/CPAN/Meta/Converter.pm
    trunk/libcpan-meta-perl/lib/CPAN/Meta/Feature.pm
    trunk/libcpan-meta-perl/lib/CPAN/Meta/History.pm
    trunk/libcpan-meta-perl/lib/CPAN/Meta/Prereqs.pm
    trunk/libcpan-meta-perl/lib/CPAN/Meta/Spec.pm
    trunk/libcpan-meta-perl/lib/CPAN/Meta/Validator.pm
    trunk/libcpan-meta-perl/t/converter.t

Modified: trunk/libcpan-meta-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/Changes?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/Changes (original)
+++ trunk/libcpan-meta-perl/Changes Sat Apr  2 14:19:21 2011
@@ -1,4 +1,11 @@
 Revision history for CPAN-Meta
+
+2.110910  2011-04-01 08:55:30 America/New_York
+
+  [ENHANCEMENTS]
+
+  - The 1.x spec "gpl" and "lgpl" and "mozilla" license values now up-convert
+    to "open_source" because they indicate too non-specific a license.
 
 2.110580  2011-02-27 07:58:06 EST5EDT
 

Modified: trunk/libcpan-meta-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/MANIFEST?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/MANIFEST (original)
+++ trunk/libcpan-meta-perl/MANIFEST Sat Apr  2 14:19:21 2011
@@ -54,6 +54,7 @@
 t/data/META-1_3.yml
 t/data/META-1_4.yml
 t/data/META-2.json
+t/data/gpl-1_4.yml
 t/data/resources.yml
 t/data/restricted-2.json
 t/data/restrictive-1_4.yml

Modified: trunk/libcpan-meta-perl/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/META.json?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/META.json (original)
+++ trunk/libcpan-meta-perl/META.json Sat Apr  2 14:19:21 2011
@@ -5,7 +5,7 @@
       "Ricardo Signes <rjbs at cpan.org>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.200002, CPAN::Meta::Converter version 2.110420",
+   "generated_by" : "Dist::Zilla version 4.200005, CPAN::Meta::Converter version 2.110580",
    "license" : [
       "perl_5"
    ],
@@ -55,13 +55,13 @@
          "web" : "http://github.com/dagolden/cpan-meta"
       }
    },
-   "version" : "2.110580",
+   "version" : "2.110910",
    "x_Dist_Zilla" : {
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::MetaNoIndex",
             "name" : "MetaNoIndex",
-            "version" : "1.101550"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::CheckExtraTests",
@@ -74,99 +74,104 @@
             "version" : "0.003"
          },
          {
+            "class" : "Dist::Zilla::Plugin::CheckPrereqsIndexed",
+            "name" : "@Filter/CheckPrereqsIndexed",
+            "version" : "0.002"
+         },
+         {
             "class" : "Dist::Zilla::Plugin::GatherDir",
             "name" : "@Filter/@Basic/GatherDir",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::PruneCruft",
             "name" : "@Filter/@Basic/PruneCruft",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@Filter/@Basic/ManifestSkip",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaYAML",
             "name" : "@Filter/@Basic/MetaYAML",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@Filter/@Basic/License",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::Readme",
             "name" : "@Filter/@Basic/Readme",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::ExecDir",
             "name" : "@Filter/@Basic/ExecDir",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::ShareDir",
             "name" : "@Filter/@Basic/ShareDir",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::MakeMaker",
             "name" : "@Filter/@Basic/MakeMaker",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::Manifest",
             "name" : "@Filter/@Basic/Manifest",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::TestRelease",
             "name" : "@Filter/@Basic/TestRelease",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::ConfirmRelease",
             "name" : "@Filter/@Basic/ConfirmRelease",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@Filter/@Basic/UploadToCPAN",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoPrereqs",
             "name" : "@Filter/AutoPrereqs",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::PkgVersion",
             "name" : "@Filter/PkgVersion",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@Filter/MetaConfig",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@Filter/MetaJSON",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::NextRelease",
             "name" : "@Filter/NextRelease",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@Filter/PodSyntaxTests",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::Repository",
@@ -182,7 +187,7 @@
                }
             },
             "name" : "@Filter/TestMoreWithSubtests",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodWeaver",
@@ -192,22 +197,22 @@
          {
             "class" : "Dist::Zilla::Plugin::Git::Check",
             "name" : "@Filter/@Git/Check",
-            "version" : "1.103520"
+            "version" : "1.110500"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Commit",
             "name" : "@Filter/@Git/Commit",
-            "version" : "1.103520"
+            "version" : "1.110500"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Tag",
             "name" : "@Filter/@Git/Tag",
-            "version" : "1.103520"
+            "version" : "1.110500"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Push",
             "name" : "@Filter/@Git/Push",
-            "version" : "1.103520"
+            "version" : "1.110500"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -218,42 +223,42 @@
                }
             },
             "name" : "Prereqs",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoVersion",
             "name" : "AutoVersion",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Push",
             "name" : "Git::Push",
-            "version" : "1.103520"
+            "version" : "1.110500"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaResources",
             "name" : "MetaResources",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "4.200002"
+            "version" : "4.200005"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "4.200002"
+            "version" : "4.200005"
          }
       ],
       "zilla" : {
@@ -261,7 +266,7 @@
          "config" : {
             "is_trial" : 0
          },
-         "version" : "4.200002"
+         "version" : "4.200005"
       }
    }
 }

Modified: trunk/libcpan-meta-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/META.yml?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/META.yml (original)
+++ trunk/libcpan-meta-perl/META.yml Sat Apr  2 14:19:21 2011
@@ -12,7 +12,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.31
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.200002, CPAN::Meta::Converter version 2.110420'
+generated_by: 'Dist::Zilla version 4.200005, CPAN::Meta::Converter version 2.110580'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -32,13 +32,13 @@
   version: 0.82
 resources:
   repository: http://github.com/dagolden/cpan-meta.git
-version: 2.110580
+version: 2.110910
 x_Dist_Zilla:
   plugins:
     -
       class: Dist::Zilla::Plugin::MetaNoIndex
       name: MetaNoIndex
-      version: 1.101550
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::CheckExtraTests
       name: CheckExtraTests
@@ -48,81 +48,85 @@
       name: CheckChangesHasContent
       version: 0.003
     -
+      class: Dist::Zilla::Plugin::CheckPrereqsIndexed
+      name: '@Filter/CheckPrereqsIndexed'
+      version: 0.002
+    -
       class: Dist::Zilla::Plugin::GatherDir
       name: '@Filter/@Basic/GatherDir'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::PruneCruft
       name: '@Filter/@Basic/PruneCruft'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::ManifestSkip
       name: '@Filter/@Basic/ManifestSkip'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::MetaYAML
       name: '@Filter/@Basic/MetaYAML'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::License
       name: '@Filter/@Basic/License'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::Readme
       name: '@Filter/@Basic/Readme'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::ExecDir
       name: '@Filter/@Basic/ExecDir'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::ShareDir
       name: '@Filter/@Basic/ShareDir'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::MakeMaker
       name: '@Filter/@Basic/MakeMaker'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::Manifest
       name: '@Filter/@Basic/Manifest'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::TestRelease
       name: '@Filter/@Basic/TestRelease'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::ConfirmRelease
       name: '@Filter/@Basic/ConfirmRelease'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::UploadToCPAN
       name: '@Filter/@Basic/UploadToCPAN'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::AutoPrereqs
       name: '@Filter/AutoPrereqs'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::PkgVersion
       name: '@Filter/PkgVersion'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::MetaConfig
       name: '@Filter/MetaConfig'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::MetaJSON
       name: '@Filter/MetaJSON'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::NextRelease
       name: '@Filter/NextRelease'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::PodSyntaxTests
       name: '@Filter/PodSyntaxTests'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::Repository
       name: '@Filter/Repository'
@@ -134,7 +138,7 @@
           phase: test
           type: requires
       name: '@Filter/TestMoreWithSubtests'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::PodWeaver
       name: '@Filter/PodWeaver'
@@ -142,19 +146,19 @@
     -
       class: Dist::Zilla::Plugin::Git::Check
       name: '@Filter/@Git/Check'
-      version: 1.103520
+      version: 1.110500
     -
       class: Dist::Zilla::Plugin::Git::Commit
       name: '@Filter/@Git/Commit'
-      version: 1.103520
+      version: 1.110500
     -
       class: Dist::Zilla::Plugin::Git::Tag
       name: '@Filter/@Git/Tag'
-      version: 1.103520
+      version: 1.110500
     -
       class: Dist::Zilla::Plugin::Git::Push
       name: '@Filter/@Git/Push'
-      version: 1.103520
+      version: 1.110500
     -
       class: Dist::Zilla::Plugin::Prereqs
       config:
@@ -162,37 +166,37 @@
           phase: runtime
           type: requires
       name: Prereqs
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::AutoVersion
       name: AutoVersion
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::Git::Push
       name: Git::Push
-      version: 1.103520
+      version: 1.110500
     -
       class: Dist::Zilla::Plugin::MetaResources
       name: MetaResources
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':InstallModules'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':TestFiles'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ExecFiles'
-      version: 4.200002
+      version: 4.200005
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ShareFiles'
-      version: 4.200002
+      version: 4.200005
   zilla:
     class: Dist::Zilla::Dist::Builder
     config:
       is_trial: 0
-    version: 4.200002
+    version: 4.200005

Modified: trunk/libcpan-meta-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/Makefile.PL?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/Makefile.PL (original)
+++ trunk/libcpan-meta-perl/Makefile.PL Sat Apr  2 14:19:21 2011
@@ -34,7 +34,7 @@
     'Version::Requirements' => '0.101020',
     'version' => '0.82'
   },
-  'VERSION' => '2.110580',
+  'VERSION' => '2.110910',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: trunk/libcpan-meta-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/README?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/README (original)
+++ trunk/libcpan-meta-perl/README Sat Apr  2 14:19:21 2011
@@ -1,7 +1,7 @@
 
 
 This archive contains the distribution CPAN-Meta,
-version 2.110580:
+version 2.110910:
 
   the distribution metadata for a CPAN dist
 

Modified: trunk/libcpan-meta-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/debian/changelog?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/debian/changelog (original)
+++ trunk/libcpan-meta-perl/debian/changelog Sat Apr  2 14:19:21 2011
@@ -1,3 +1,10 @@
+libcpan-meta-perl (2.110910-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Updated copyright
+
+ -- Nicholas Bamber <nicholas at periapt.co.uk>  Sat, 02 Apr 2011 15:20:59 +0100
+
 libcpan-meta-perl (2.110580-1) unstable; urgency=low
 
   [ Ansgar Burchardt ]

Modified: trunk/libcpan-meta-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/debian/copyright?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/debian/copyright (original)
+++ trunk/libcpan-meta-perl/debian/copyright Sat Apr  2 14:19:21 2011
@@ -10,7 +10,7 @@
 
 Files: debian/*
 Copyright: 2010, Ansgar Burchardt <ansgar at debian.org>
- 2010, Nicholas Bamber <nicholas at periapt.co.uk>
+ 2010-2011, Nicholas Bamber <nicholas at periapt.co.uk>
  2011, Jonathan Yu <jawnsy at cpan.org>
 License: Artistic or GPL-1+
 

Modified: trunk/libcpan-meta-perl/lib/CPAN/Meta.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/lib/CPAN/Meta.pm?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/lib/CPAN/Meta.pm (original)
+++ trunk/libcpan-meta-perl/lib/CPAN/Meta.pm Sat Apr  2 14:19:21 2011
@@ -3,7 +3,7 @@
 use warnings;
 package CPAN::Meta;
 BEGIN {
-  $CPAN::Meta::VERSION = '2.110580';
+  $CPAN::Meta::VERSION = '2.110910';
 }
 # ABSTRACT: the distribution metadata for a CPAN dist
 
@@ -354,7 +354,7 @@
 
 =head1 VERSION
 
-version 2.110580
+version 2.110910
 
 =head1 SYNOPSIS
 

Modified: trunk/libcpan-meta-perl/lib/CPAN/Meta/Converter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/lib/CPAN/Meta/Converter.pm?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/lib/CPAN/Meta/Converter.pm (original)
+++ trunk/libcpan-meta-perl/lib/CPAN/Meta/Converter.pm Sat Apr  2 14:19:21 2011
@@ -3,7 +3,7 @@
 use warnings;
 package CPAN::Meta::Converter;
 BEGIN {
-  $CPAN::Meta::Converter::VERSION = '2.110580';
+  $CPAN::Meta::Converter::VERSION = '2.110910';
 }
 # ABSTRACT: Convert CPAN distribution metadata structures
 
@@ -142,15 +142,18 @@
   unknown
 );
 
+# The "old" values were defined by Module::Build, and were often vague.  I have
+# made the decisions below based on reading Module::Build::API and how clearly
+# it specifies the version of the license.
 my %license_map_2 = (
-  ( 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',
+  (map { $_ => $_ } @valid_licenses_2),
+  apache      => 'apache_2_0',  # clearly stated as 2.0
+  artistic    => 'artistic_1',  # clearly stated as 1
+  artistic2   => 'artistic_2',  # clearly stated as 2
+  gpl         => 'open_source', # we don't know which GPL; punt
+  lgpl        => 'open_source', # we don't know which LGPL; punt
+  mozilla     => 'open_source', # we don't know which MPL; punt
+  perl        => 'perl_5',      # clearly Perl 5
   restrictive => 'restricted',
 );
 
@@ -1250,7 +1253,7 @@
 
 =head1 VERSION
 
-version 2.110580
+version 2.110910
 
 =head1 SYNOPSIS
 

Modified: trunk/libcpan-meta-perl/lib/CPAN/Meta/Feature.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/lib/CPAN/Meta/Feature.pm?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/lib/CPAN/Meta/Feature.pm (original)
+++ trunk/libcpan-meta-perl/lib/CPAN/Meta/Feature.pm Sat Apr  2 14:19:21 2011
@@ -3,7 +3,7 @@
 use warnings;
 package CPAN::Meta::Feature;
 BEGIN {
-  $CPAN::Meta::Feature::VERSION = '2.110580';
+  $CPAN::Meta::Feature::VERSION = '2.110910';
 }
 # ABSTRACT: an optional feature provided by a CPAN distribution
 
@@ -43,7 +43,7 @@
 
 =head1 VERSION
 
-version 2.110580
+version 2.110910
 
 =head1 DESCRIPTION
 

Modified: trunk/libcpan-meta-perl/lib/CPAN/Meta/History.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/lib/CPAN/Meta/History.pm?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/lib/CPAN/Meta/History.pm (original)
+++ trunk/libcpan-meta-perl/lib/CPAN/Meta/History.pm Sat Apr  2 14:19:21 2011
@@ -4,7 +4,7 @@
 use warnings;
 package CPAN::Meta::History;
 BEGIN {
-  $CPAN::Meta::History::VERSION = '2.110580';
+  $CPAN::Meta::History::VERSION = '2.110910';
 }
 # ABSTRACT: history of CPAN Meta Spec changes
 1;
@@ -20,7 +20,7 @@
 
 =head1 VERSION
 
-version 2.110580
+version 2.110910
 
 =head1 DESCRIPTION
 

Modified: trunk/libcpan-meta-perl/lib/CPAN/Meta/Prereqs.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/lib/CPAN/Meta/Prereqs.pm?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/lib/CPAN/Meta/Prereqs.pm (original)
+++ trunk/libcpan-meta-perl/lib/CPAN/Meta/Prereqs.pm Sat Apr  2 14:19:21 2011
@@ -3,7 +3,7 @@
 use warnings;
 package CPAN::Meta::Prereqs;
 BEGIN {
-  $CPAN::Meta::Prereqs::VERSION = '2.110580';
+  $CPAN::Meta::Prereqs::VERSION = '2.110910';
 }
 # ABSTRACT: a set of distribution prerequisites by phase and type
 
@@ -150,7 +150,7 @@
 
 =head1 VERSION
 
-version 2.110580
+version 2.110910
 
 =head1 DESCRIPTION
 

Modified: trunk/libcpan-meta-perl/lib/CPAN/Meta/Spec.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/lib/CPAN/Meta/Spec.pm?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/lib/CPAN/Meta/Spec.pm (original)
+++ trunk/libcpan-meta-perl/lib/CPAN/Meta/Spec.pm Sat Apr  2 14:19:21 2011
@@ -4,7 +4,7 @@
 use warnings;
 package CPAN::Meta::Spec;
 BEGIN {
-  $CPAN::Meta::Spec::VERSION = '2.110580';
+  $CPAN::Meta::Spec::VERSION = '2.110910';
 }
 # ABSTRACT: specification for CPAN distribution metadata
 1;
@@ -20,7 +20,7 @@
 
 =head1 VERSION
 
-version 2.110580
+version 2.110910
 
 =head1 SYNOPSIS
 

Modified: trunk/libcpan-meta-perl/lib/CPAN/Meta/Validator.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/lib/CPAN/Meta/Validator.pm?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/lib/CPAN/Meta/Validator.pm (original)
+++ trunk/libcpan-meta-perl/lib/CPAN/Meta/Validator.pm Sat Apr  2 14:19:21 2011
@@ -3,7 +3,7 @@
 use warnings;
 package CPAN::Meta::Validator;
 BEGIN {
-  $CPAN::Meta::Validator::VERSION = '2.110580';
+  $CPAN::Meta::Validator::VERSION = '2.110910';
 }
 # ABSTRACT: validate CPAN distribution metadata structures
 
@@ -839,7 +839,7 @@
 
 =head1 VERSION
 
-version 2.110580
+version 2.110910
 
 =head1 SYNOPSIS
 

Modified: trunk/libcpan-meta-perl/t/converter.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcpan-meta-perl/t/converter.t?rev=72147&op=diff
==============================================================================
--- trunk/libcpan-meta-perl/t/converter.t (original)
+++ trunk/libcpan-meta-perl/t/converter.t Sat Apr  2 14:19:21 2011
@@ -110,9 +110,22 @@
   my $original = Parse::CPAN::Meta->load_file( $path  );
   ok( $original, "loaded META-2.json" );
   my $cmc = CPAN::Meta::Converter->new( $original );
-  my $up_converted = $cmc->convert( version => 1.4 );
-  ok ( $up_converted->{x_whatever},
+  my $down_converted = $cmc->convert( version => 1.4 );
+  ok ( $down_converted->{x_whatever},
     "down converted 'x_' as 'x_'"
+  );
+}
+
+# specific test for generalization of unclear licenses
+{
+  my $path = File::Spec->catfile('t','data','gpl-1_4.yml');
+  my $original = Parse::CPAN::Meta->load_file( $path  );
+  ok( $original, "loaded gpl-1_4.yml" );
+  my $cmc = CPAN::Meta::Converter->new( $original );
+  my $up_converted = $cmc->convert( version => 2 );
+  is_deeply ( $up_converted->{license},
+    [ "open_source" ],
+    "up converted 'gpl' to 'open_source'"
   );
 }
 




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