r71930 - in /trunk/libcatalyst-devel-perl: ./ debian/ lib/Catalyst/ lib/Catalyst/Restarter/ lib/Module/Install/ t/

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Wed Mar 23 23:01:44 UTC 2011


Author: jawnsy-guest
Date: Wed Mar 23 23:01:19 2011
New Revision: 71930

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=71930
Log:
* New upstream release
* Bump to debhelper compat 8

Modified:
    trunk/libcatalyst-devel-perl/Changes
    trunk/libcatalyst-devel-perl/META.yml
    trunk/libcatalyst-devel-perl/Makefile.PL
    trunk/libcatalyst-devel-perl/debian/changelog
    trunk/libcatalyst-devel-perl/debian/compat
    trunk/libcatalyst-devel-perl/debian/control
    trunk/libcatalyst-devel-perl/lib/Catalyst/Devel.pm
    trunk/libcatalyst-devel-perl/lib/Catalyst/Helper.pm
    trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter.pm
    trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Forking.pm
    trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Win32.pm
    trunk/libcatalyst-devel-perl/lib/Module/Install/Catalyst.pm
    trunk/libcatalyst-devel-perl/t/get_sharedir_file.t

Modified: trunk/libcatalyst-devel-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/Changes?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/Changes (original)
+++ trunk/libcatalyst-devel-perl/Changes Wed Mar 23 23:01:19 2011
@@ -1,4 +1,9 @@
 This file documents the revision history for Perl extension Catalyst-Devel.
+
+1.32 2011-03-22 09:17:00
+        - Fix RT#65907: missing build require: Test::Exception
+        - Fix RT#57019: Fix bundling of File::Copy::Recursive in inc/
+          by Module::Install::Catalyst
 
 1.31 2011-01-20 01:08:00
         - Fix for copying generated files into installed apps + tests

Modified: trunk/libcatalyst-devel-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/META.yml?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/META.yml (original)
+++ trunk/libcatalyst-devel-perl/META.yml Wed Mar 23 23:01:19 2011
@@ -4,6 +4,7 @@
   - 'Catalyst Contributors, see Catalyst.pm'
 build_requires:
   ExtUtils::MakeMaker: 6.42
+  Test::Fatal: 0.003
   Test::More: 0.94
 configure_requires:
   ExtUtils::MakeMaker: 6.42
@@ -34,6 +35,7 @@
   MooseX::Emulate::Class::Accessor::Fast: 0
   Path::Class: 0.09
   Template: 2.14
+  Test::Fatal: 0.003
   Test::More: 0.94
   namespace::autoclean: 0
   namespace::clean: 0
@@ -43,4 +45,4 @@
   homepage: http://dev.catalyst.perl.org/
   license: http://dev.perl.org/licenses/
   repository: git://git.shadowcat.co.uk/catagits/Catalyst-Devel.git
-version: 1.31
+version: 1.32

Modified: trunk/libcatalyst-devel-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/Makefile.PL?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/Makefile.PL (original)
+++ trunk/libcatalyst-devel-perl/Makefile.PL Wed Mar 23 23:01:19 2011
@@ -34,6 +34,7 @@
 author_requires 'File::Find::Rule';
 
 test_requires 'Test::More' => '0.94';
+test_requires 'Test::Fatal' => '0.003';
 
 install_share 'share';
 

Modified: trunk/libcatalyst-devel-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/debian/changelog?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/debian/changelog (original)
+++ trunk/libcatalyst-devel-perl/debian/changelog Wed Mar 23 23:01:19 2011
@@ -1,3 +1,10 @@
+libcatalyst-devel-perl (1.32-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Bump to debhelper compat 8
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Wed, 23 Mar 2011 19:19:28 -0400
+
 libcatalyst-devel-perl (1.31-2) unstable; urgency=low
 
   * Add build dependency on libtest-exception-perl (closes: #615622).

Modified: trunk/libcatalyst-devel-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/debian/compat?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/debian/compat (original)
+++ trunk/libcatalyst-devel-perl/debian/compat Wed Mar 23 23:01:19 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: trunk/libcatalyst-devel-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/debian/control?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/debian/control (original)
+++ trunk/libcatalyst-devel-perl/debian/control Wed Mar 23 23:01:19 2011
@@ -1,14 +1,25 @@
 Source: libcatalyst-devel-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl, libmoosex-emulate-class-accessor-fast-perl,
- libnamespace-autoclean-perl, libcatalyst-modules-perl, libtemplate-perl,
- libmodule-install-perl (>= 0.91), libfile-changenotify-perl, libmoose-perl,
- libconfig-general-perl (>= 2.42), libpath-class-perl, libfile-sharedir-perl,
- libcatalyst-perl (>= 5.80015), libfile-copy-recursive-perl,
- libnamespace-clean-perl, libtest-simple-perl (>= 0.94),
- libipc-run3-perl, libyaml-tiny-perl, libtest-exception-perl
+Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: perl,
+ libmoosex-emulate-class-accessor-fast-perl,
+ libnamespace-autoclean-perl,
+ libcatalyst-modules-perl,
+ libtemplate-perl,
+ libmodule-install-perl (>= 0.91),
+ libfile-changenotify-perl,
+ libmoose-perl,
+ libconfig-general-perl (>= 2.42),
+ libpath-class-perl,
+ libfile-sharedir-perl,
+ libcatalyst-perl (>= 5.80015),
+ libfile-copy-recursive-perl,
+ libnamespace-clean-perl,
+ libtest-simple-perl (>= 0.94),
+ libipc-run3-perl,
+ libyaml-tiny-perl,
+ libtest-exception-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jawnsy at cpan.org>, gregor herrmann <gregoa at debian.org>,
  Ansgar Burchardt <ansgar at debian.org>
@@ -19,11 +30,19 @@
 
 Package: libcatalyst-devel-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libcatalyst-perl (>= 5.80015),
- libmoosex-emulate-class-accessor-fast-perl, libtemplate-perl, libmoose-perl,
- libnamespace-clean-perl, libnamespace-autoclean-perl, libfile-sharedir-perl,
- libfile-changenotify-perl, libfile-copy-recursive-perl, libpath-class-perl,
- libconfig-general-perl (>= 2.42), libyaml-tiny-perl
+Depends: ${perl:Depends}, ${misc:Depends},
+ libcatalyst-perl (>= 5.80015),
+ libmoosex-emulate-class-accessor-fast-perl,
+ libtemplate-perl,
+ libmoose-perl,
+ libnamespace-clean-perl,
+ libnamespace-autoclean-perl,
+ libfile-sharedir-perl,
+ libfile-changenotify-perl,
+ libfile-copy-recursive-perl,
+ libpath-class-perl,
+ libconfig-general-perl (>= 2.42),
+ libyaml-tiny-perl
 Suggests: libmodule-install-perl (>= 0.91)
 Breaks: libcatalyst-modules-perl (<< 39)
 Replaces: libcatalyst-modules-perl (<< 39)

Modified: trunk/libcatalyst-devel-perl/lib/Catalyst/Devel.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/lib/Catalyst/Devel.pm?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/lib/Catalyst/Devel.pm (original)
+++ trunk/libcatalyst-devel-perl/lib/Catalyst/Devel.pm Wed Mar 23 23:01:19 2011
@@ -4,7 +4,7 @@
 use warnings;
 
 # Change Catalyst::Helper also.
-our $VERSION             = '1.31';
+our $VERSION             = '1.32';
 our $CATALYST_SCRIPT_GEN = 40;
 
 $VERSION = eval $VERSION;

Modified: trunk/libcatalyst-devel-perl/lib/Catalyst/Helper.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/lib/Catalyst/Helper.pm?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/lib/Catalyst/Helper.pm (original)
+++ trunk/libcatalyst-devel-perl/lib/Catalyst/Helper.pm Wed Mar 23 23:01:19 2011
@@ -19,7 +19,7 @@
 with 'MooseX::Emulate::Class::Accessor::Fast';
 
 # Change Catalyst/Devel.pm also
-our $VERSION = '1.31';
+our $VERSION = '1.32';
 
 my %cache;
 

Modified: trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter.pm?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter.pm (original)
+++ trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter.pm Wed Mar 23 23:01:19 2011
@@ -6,6 +6,7 @@
 use File::ChangeNotify;
 use File::Spec;
 use FindBin;
+use Catalyst::Utils qw/ ensure_class_loaded /;
 use namespace::clean -except => 'meta';
 
 has start_sub => (
@@ -48,8 +49,7 @@
 
     $subclass = 'Catalyst::Restarter::' . $subclass;
 
-    eval "use $subclass";
-    die $@ if $@;
+    ensure_class_loaded($subclass);
 
     return $subclass;
 }

Modified: trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Forking.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Forking.pm?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Forking.pm (original)
+++ trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Forking.pm Wed Mar 23 23:01:19 2011
@@ -36,6 +36,8 @@
     wait;
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;
 
 __END__

Modified: trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Win32.pm?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Win32.pm (original)
+++ trunk/libcatalyst-devel-perl/lib/Catalyst/Restarter/Win32.pm Wed Mar 23 23:01:19 2011
@@ -31,6 +31,8 @@
     $self->_child->die;
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;
 
 __END__

Modified: trunk/libcatalyst-devel-perl/lib/Module/Install/Catalyst.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/lib/Module/Install/Catalyst.pm?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/lib/Module/Install/Catalyst.pm (original)
+++ trunk/libcatalyst-devel-perl/lib/Module/Install/Catalyst.pm Wed Mar 23 23:01:19 2011
@@ -60,10 +60,7 @@
     my $self = shift;
 
     if($Module::Install::AUTHOR) {
-        $self->admin->copy_package(
-            'File::Copy::Recursive',
-            $INC{"File/Copy/Recursive.pm"},
-        );
+        $self->include("File::Copy::Recursive");
     }
 
     print <<EOF;

Modified: trunk/libcatalyst-devel-perl/t/get_sharedir_file.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-devel-perl/t/get_sharedir_file.t?rev=71930&op=diff
==============================================================================
--- trunk/libcatalyst-devel-perl/t/get_sharedir_file.t (original)
+++ trunk/libcatalyst-devel-perl/t/get_sharedir_file.t Wed Mar 23 23:01:19 2011
@@ -1,20 +1,20 @@
 use strict;
 use warnings;
 
-use Test::More;
-use Test::Exception;
+use Test::More 0.88;
+use Test::Fatal;
 
 use Catalyst::Helper;
 
 my $i = bless {}, 'Catalyst::Helper';
 
-throws_ok {
+like exception {
     $i->get_sharedir_file(qw/does not exist and hopefully never will or we are
         totally screwed.txt/);
-} qr/Cannot find/, 'Exception for file not found from ->get_sharedir_file';
+}, qr/Cannot find/, 'Exception for file not found from ->get_sharedir_file';
 
-lives_ok {
+is exception {
     ok($i->get_sharedir_file('Makefile.PL.tt'), 'has contents');
-} 'Can get_sharedir_file';
+}, undef, 'Can get_sharedir_file';
 
 done_testing;




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