r64990 - in /trunk/libmodule-depends-perl/debian/patches: configure_test_requires.patch meta_json.patch set-environment-variables yaml_xs.patch

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Wed Nov 17 18:48:55 2010
New Revision: 64990

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64990
Log:
refresh patches. phew.

Modified:
    trunk/libmodule-depends-perl/debian/patches/configure_test_requires.patch
    trunk/libmodule-depends-perl/debian/patches/meta_json.patch
    trunk/libmodule-depends-perl/debian/patches/set-environment-variables
    trunk/libmodule-depends-perl/debian/patches/yaml_xs.patch

Modified: trunk/libmodule-depends-perl/debian/patches/configure_test_requires.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-depends-perl/debian/patches/configure_test_requires.patch?rev=64990&op=diff
==============================================================================
--- trunk/libmodule-depends-perl/debian/patches/configure_test_requires.patch (original)
+++ trunk/libmodule-depends-perl/debian/patches/configure_test_requires.patch Wed Nov 17 18:48:55 2010
@@ -1,4 +1,11 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541165
+Description: add support for test_requires and configure_requires
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541165
+Forwarded: no
+Author: Ryan Niebur <ryan at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2010-11-17
+
 
 --- a/lib/Module/Depends.pm
 +++ b/lib/Module/Depends.pm
@@ -8,7 +15,7 @@
  use base qw( Class::Accessor::Chained );
 -__PACKAGE__->mk_accessors(qw( dist_dir debug libs requires build_requires error ));
 +__PACKAGE__->mk_accessors(qw( dist_dir debug libs requires build_requires test_requires configure_requires error ));
- our $VERSION = '0.14';
+ our $VERSION = '0.15';
  
  =head1 NAME
 @@ -41,6 +41,8 @@
@@ -35,9 +42,9 @@
          $self->build_requires( $meta->{build_requires} );
 +        $self->configure_requires( $meta->{configure_requires} );
 +        $self->test_requires( $meta->{test_requires} );
-         return $self;
      }
-   }
+     else {
+         $self->error( "No META.yml found in ". $self->dist_dir );
 --- a/lib/Module/Depends/Intrusive.pm
 +++ b/lib/Module/Depends/Intrusive.pm
 @@ -32,6 +32,8 @@

Modified: trunk/libmodule-depends-perl/debian/patches/meta_json.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-depends-perl/debian/patches/meta_json.patch?rev=64990&op=diff
==============================================================================
--- trunk/libmodule-depends-perl/debian/patches/meta_json.patch (original)
+++ trunk/libmodule-depends-perl/debian/patches/meta_json.patch Wed Nov 17 18:48:55 2010
@@ -1,24 +1,23 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541164
+Description: add support for parsing META.json
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541164
+Forwarded: no
+Author: Ryan Niebur <ryan at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2010-11-17
+
 
 --- a/lib/Module/Depends.pm
 +++ b/lib/Module/Depends.pm
-@@ -73,15 +73,15 @@
+@@ -73,9 +73,9 @@
  sub _find_modules {
      my $self = shift;
  
--    my $file = 'META.yml';
-+    foreach my $file (qw/META.yml META.json/) {
-     if (-e $file) {
-         my $meta = LoadFile( $file );
+-    my ($file) = grep { -e $_ } qw( MYMETA.yml META.yml );
++    my ($file) = grep { -e $_ } qw( MYMETA.yml META.yml META.json );
+     if ($file) {
+-        my $meta = ( Parse::CPAN::Meta::LoadFile( $file ) )[0];
++        my $meta = LoadFile( $file );
          $self->requires( $meta->{requires} );
          $self->build_requires( $meta->{build_requires} );
-+        return $self;
      }
--    else {
--        $self->error( "No META.yml found in ". $self->dist_dir );
--    }
-+  }
-+    $self->error( "No META.yml found in ". $self->dist_dir );
-     return $self;
- }
- 

Modified: trunk/libmodule-depends-perl/debian/patches/set-environment-variables
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-depends-perl/debian/patches/set-environment-variables?rev=64990&op=diff
==============================================================================
--- trunk/libmodule-depends-perl/debian/patches/set-environment-variables (original)
+++ trunk/libmodule-depends-perl/debian/patches/set-environment-variables Wed Nov 17 18:48:55 2010
@@ -1,4 +1,10 @@
-set some variables to keep the build system from doing stupid stuff
+Description: set some variables to keep the build system from doing stupid stuff
+Origin: vendor
+Forwarded: no
+Author: Ryan Niebur <ryan at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2010-11-17
+
 
 --- a/lib/Module/Depends/Intrusive.pm
 +++ b/lib/Module/Depends/Intrusive.pm

Modified: trunk/libmodule-depends-perl/debian/patches/yaml_xs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libmodule-depends-perl/debian/patches/yaml_xs.patch?rev=64990&op=diff
==============================================================================
--- trunk/libmodule-depends-perl/debian/patches/yaml_xs.patch (original)
+++ trunk/libmodule-depends-perl/debian/patches/yaml_xs.patch Wed Nov 17 18:48:55 2010
@@ -1,11 +1,18 @@
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541159
+Description: use YAML::XS in order to support JSON META.ymls plus META.json (see next patch)
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541159
+Forwarded: no
+Author: Ryan Niebur <ryan at debian.org>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2010-11-17
+
 
 --- a/lib/Module/Depends.pm
 +++ b/lib/Module/Depends.pm
 @@ -1,6 +1,6 @@
  use strict;
  package Module::Depends;
--use YAML qw( LoadFile );
+-use Parse::CPAN::Meta;
 +use YAML::XS qw/LoadFile/;
  use Cwd qw( getcwd );
  use base qw( Class::Accessor::Chained );