r27991 - in /branches/upstream/librose-object-perl/current: ./ lib/Rose/ lib/Rose/Class/MakeMethods/ lib/Rose/Object/ lib/Rose/Object/MakeMethods/

bricas-guest at users.alioth.debian.org bricas-guest at users.alioth.debian.org
Wed Dec 10 13:20:32 UTC 2008


Author: bricas-guest
Date: Wed Dec 10 13:20:29 2008
New Revision: 27991

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27991
Log:
[svn-upgrade] Integrating new upstream version, librose-object-perl (0.854)

Modified:
    branches/upstream/librose-object-perl/current/Changes
    branches/upstream/librose-object-perl/current/META.yml
    branches/upstream/librose-object-perl/current/Makefile.PL
    branches/upstream/librose-object-perl/current/lib/Rose/Class.pm
    branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Generic.pm
    branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Set.pm
    branches/upstream/librose-object-perl/current/lib/Rose/Object.pm
    branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods.pm
    branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/DateTime.pm
    branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/Generic.pm
    branches/upstream/librose-object-perl/current/lib/Rose/Object/MixIn.pm

Modified: branches/upstream/librose-object-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/Changes?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/Changes (original)
+++ branches/upstream/librose-object-perl/current/Changes Wed Dec 10 13:20:29 2008
@@ -1,3 +1,8 @@
+0.854 (12.09.2008) - John Siracusa <siracusa at gmail.com>
+
+    * Altered the default name for the adds_method and inherits_method
+      method types in the inherited_hash class method maker.
+
 0.853 (07.30.2008) - John Siracusa <siracusa at gmail.com>
 
     * Fixed a bug in the hash get_set_init method interface.  (Reported

Modified: branches/upstream/librose-object-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/META.yml?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/META.yml (original)
+++ branches/upstream/librose-object-perl/current/META.yml Wed Dec 10 13:20:29 2008
@@ -1,14 +1,27 @@
 --- #YAML:1.0
-name:                Rose-Object
-version:             0.853
-abstract:            ~
-license:             ~
-author:              ~
-generated_by:        ExtUtils::MakeMaker version 6.44
-distribution_type:   module
-requires:     
-    Test::More:                    0
-    Test::Simple:                  0
+name:               Rose-Object
+version:            0.854
+abstract:           A simple object base class.
+author:
+    - John Siracusa <siracusa at gmail.com>
+license:            perl
+distribution_type:  module
+configure_requires:
+    ExtUtils::MakeMaker:  0
+requires:
+    perl:          5.006000
+    Test::More:    0
+    Test::Simple:  0
+resources:
+    bugtracker:  http://rt.cpan.org/NoAuth/Bugs.html?Dist=Rose-Object
+    homepage:    http://rose.googlecode.com/
+    license:     http://dev.perl.org/licenses/
+    repository:  http://rose.googlecode.com/svn/trunk/modules/Rose-Object
+no_index:
+    directory:
+        - t
+        - inc
+generated_by:       ExtUtils::MakeMaker version 6.48
 meta-spec:
-    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
-    version: 1.3
+    url:      http://module-build.sourceforge.net/META-spec-v1.4.html
+    version:  1.4

Modified: branches/upstream/librose-object-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/Makefile.PL?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/Makefile.PL (original)
+++ branches/upstream/librose-object-perl/current/Makefile.PL Wed Dec 10 13:20:29 2008
@@ -20,15 +20,38 @@
 EOF
 }
 
-WriteMakefile(NAME         => 'Rose::Object',
-              PMLIBDIRS    => [ 'lib' ],
-              VERSION_FROM => 'lib/Rose/Object.pm',
-              ($^O =~ /darwin/i ?
-               (dist => { DIST_CP => 'cp' }) : ()), # Avoid Mac OS X ._* files
+my $MM_Version = $ExtUtils::MakeMaker::VERSION;
+
+if($MM_Version =~ /_/) # dev version
+{
+  $MM_Version = eval $MM_Version;
+  die $@  if($@);
+}
+
+WriteMakefile(NAME          => 'Rose::Object',
+              ABSTRACT_FROM => 'lib/Rose/Object.pm',
+              VERSION_FROM  => 'lib/Rose/Object.pm',
+              ($^O =~ /darwin/i ? (dist => { DIST_CP => 'cp' }) : ()), # Avoid Mac OS X ._* files
               PREREQ_PM =>
               {
                 # This is a circular dependency...
                 #Rose::DateTime => 0,
                 Test::Simple => 0,
                 Test::More   => 0,
-              });
+              },
+              AUTHOR => 'John Siracusa <siracusa at gmail.com>',
+              ($MM_Version >= 6.48 ? (MIN_PERL_VERSION => '5.6.0') : ()),
+              ($MM_Version >= 6.31 ? (LICENSE => 'perl') : ()),
+              ($MM_Version <= 6.44 ? () : 
+              (META_MERGE => 
+              {
+                resources =>
+                {
+                  license     => 'http://dev.perl.org/licenses/',
+                  homepage    => 'http://rose.googlecode.com/',
+                  bugtracker  => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=Rose-Object',
+                  repository  => 'http://rose.googlecode.com/svn/trunk/modules/Rose-Object',
+                },
+              })));
+
+

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Class.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Class.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Class.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Class.pm Wed Dec 10 13:20:29 2008
@@ -58,7 +58,7 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2006 by John C. Siracusa.  All rights reserved.  This program is
 free software; you can redistribute it and/or modify it under the same terms

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Generic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Generic.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Generic.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Generic.pm Wed Dec 10 13:20:29 2008
@@ -4,7 +4,7 @@
 
 use Carp();
 
-our $VERSION = '0.851';
+our $VERSION = '0.854';
 
 use Rose::Object::MakeMethods;
 our @ISA = qw(Rose::Object::MakeMethods);
@@ -542,12 +542,12 @@
   my $cache_method       = $args->{'cache_method'}    || $plural_name . '_cache';
   my $exists_method      = $args->{'exists_method'}   || $args->{'exists_method'} || $name . '_exists';
   my $add_method         = $args->{'add_method'}      || 'add_' . $name;
-  my $adds_method        = $args->{'adds_method'}     || $add_method . 's';
+  my $adds_method        = $args->{'adds_method'}     || 'add_' . $plural_name;
   my $delete_method      = $args->{'delete_method'}   || 'delete_' . $name;
   my $deletes_method     = $args->{'deletes_method'}  || 'delete_' . $plural_name;
   my $clear_method       = $args->{'clear_method'}    || 'clear_' . $plural_name;
   my $inherit_method     = $args->{'inherit_method'}  || 'inherit_' . $name;
-  my $inherits_method    = $args->{'inherits_method'} || $inherit_method . 's';
+  my $inherits_method    = $args->{'inherits_method'} || 'inherit_' . $plural_name;
 
   my $interface       = $args->{'interface'} || 'all';
 
@@ -1452,7 +1452,7 @@
 
 =item C<adds_method>
 
-The name of the class method used to add one or more name/value pairs to the hash.  Defaults to C<add_method> with C<s> added to the end.
+The name of the class method used to add one or more name/value pairs to the hash.  Defaults to C<plural_name> with the prefix C<add_> added.
 
 =item C<cache_method>
 
@@ -1492,7 +1492,7 @@
 
 =item C<inherits_method>
 
-The name of the class method used to indicate that one or more inherited keys that were previously deleted from the hash should return to being inherited.  Defaults to the C<inherit_method> name with C<s> added to the end.
+The name of the class method used to indicate that one or more inherited keys that were previously deleted from the hash should return to being inherited.  Defaults to the C<plural_name> with the prefix C<inherit_> added.
 
 =item C<interface>
 
@@ -1602,7 +1602,7 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2006 by John C. Siracusa.  All rights reserved.  This program is
 free software; you can redistribute it and/or modify it under the same terms

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Set.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Set.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Set.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Class/MakeMethods/Set.pm Wed Dec 10 13:20:29 2008
@@ -987,6 +987,6 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2006 by John C. Siracusa.  All rights reserved.  This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Object.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Object.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Object.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Object.pm Wed Dec 10 13:20:29 2008
@@ -2,7 +2,7 @@
 
 use strict;
 
-our $VERSION = '0.853';
+our $VERSION = '0.854';
 
 sub new
 {
@@ -82,7 +82,7 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2006 by John C. Siracusa.  All rights reserved.  This program is
 free software; you can redistribute it and/or modify it under the same terms

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods.pm Wed Dec 10 13:20:29 2008
@@ -43,7 +43,7 @@
   return 1;
 }
 
-# Can't use the clas method maker easily here due to a chicken/egg
+# Can't use the class method maker easily here due to a chicken/egg
 # situation, so this code is manually inlined.
 my %Inheritable_Scalar;
 
@@ -713,6 +713,6 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2006 by John C. Siracusa.  All rights reserved.  This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/DateTime.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/DateTime.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/DateTime.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/DateTime.pm Wed Dec 10 13:20:29 2008
@@ -315,7 +315,7 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2006 by John C. Siracusa.  All rights reserved.  This program is
 free software; you can redistribute it and/or modify it under the same terms

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/Generic.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/Generic.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/Generic.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Object/MakeMethods/Generic.pm Wed Dec 10 13:20:29 2008
@@ -1120,7 +1120,7 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2006 by John C. Siracusa.  All rights reserved.  This program is
 free software; you can redistribute it and/or modify it under the same terms

Modified: branches/upstream/librose-object-perl/current/lib/Rose/Object/MixIn.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/librose-object-perl/current/lib/Rose/Object/MixIn.pm?rev=27991&op=diff
==============================================================================
--- branches/upstream/librose-object-perl/current/lib/Rose/Object/MixIn.pm (original)
+++ branches/upstream/librose-object-perl/current/lib/Rose/Object/MixIn.pm Wed Dec 10 13:20:29 2008
@@ -304,7 +304,7 @@
 
 John C. Siracusa (siracusa at gmail.com)
 
-=head1 COPYRIGHT
+=head1 LICENSE
 
 Copyright (c) 2008 by John C. Siracusa.  All rights reserved.  This program is
 free software; you can redistribute it and/or modify it under the same terms




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