r52455 - in /trunk/libcatalyst-model-cdbi-perl: Changes META.yml Makefile.PL debian/changelog debian/control debian/copyright debian/source/ debian/source/format lib/Catalyst/Helper/Model/CDBI.pm lib/Catalyst/Model/CDBI.pm t/01use.t
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Wed Feb 10 15:13:07 UTC 2010
Author: ansgar-guest
Date: Wed Feb 10 15:12:59 2010
New Revision: 52455
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52455
Log:
* New upstream release.
+ Add (build-)dep on libmro-compat-perl.
* debian/copyright: Update years of copyright, minor changes for DEP-5.
* debian/control: Add note that this module is deprecated to description.
* Use source format 3.0 (quilt).
* Bump Standards-Version to 3.8.4 (no changes).
Added:
trunk/libcatalyst-model-cdbi-perl/debian/source/
trunk/libcatalyst-model-cdbi-perl/debian/source/format
Modified:
trunk/libcatalyst-model-cdbi-perl/Changes
trunk/libcatalyst-model-cdbi-perl/META.yml
trunk/libcatalyst-model-cdbi-perl/Makefile.PL
trunk/libcatalyst-model-cdbi-perl/debian/changelog
trunk/libcatalyst-model-cdbi-perl/debian/control
trunk/libcatalyst-model-cdbi-perl/debian/copyright
trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Helper/Model/CDBI.pm
trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Model/CDBI.pm
trunk/libcatalyst-model-cdbi-perl/t/01use.t
Modified: trunk/libcatalyst-model-cdbi-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/Changes?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/Changes (original)
+++ trunk/libcatalyst-model-cdbi-perl/Changes Wed Feb 10 15:12:59 2010
@@ -1,6 +1,12 @@
Revision history for Perl extension Catalyst::Model::CDBI.
+0.12 Tue Jan 09 02:36:00
+ - Work around MRO problems in CDBI by massaging CDBI::__::Base's ISA
+ - Switch from NEXT to MRO::Compat
+ - Switch from Catalyst::Base to Catalyst::Component
+ - Fix RT#18197
+ - Add deprecation notice.
-0.11
+0.11 Wed Nov 23 09:46:00 2005
- Throw an exception during startup if there is an error loading
tables.
Modified: trunk/libcatalyst-model-cdbi-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/META.yml?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/META.yml (original)
+++ trunk/libcatalyst-model-cdbi-perl/META.yml Wed Feb 10 15:12:59 2010
@@ -1,13 +1,25 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
-name: Catalyst-Model-CDBI
-version: 0.11
-version_from: lib/Catalyst/Model/CDBI.pm
-installdirs: site
+--- #YAML:1.0
+name: Catalyst-Model-CDBI
+version: 0.12
+abstract: ~
+author:
+ - Sebastian Riedel (sri at oook.de)
+license: unknown
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
requires:
- Catalyst: 4.00
- Class::DBI: 0
- Class::DBI::Loader: 0.2
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+ Catalyst: 4.00
+ Class::DBI: 0
+ Class::DBI::Loader: 0.2
+ MRO::Compat: 0
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.54
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: trunk/libcatalyst-model-cdbi-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/Makefile.PL?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/Makefile.PL (original)
+++ trunk/libcatalyst-model-cdbi-perl/Makefile.PL Wed Feb 10 15:12:59 2010
@@ -5,6 +5,7 @@
AUTHOR => 'Sebastian Riedel (sri at oook.de)',
PREREQ_PM => {
Catalyst => '4.00',
+ MRO::Compat => 0,
Class::DBI => 0,
Class::DBI::Loader => 0.20
},
Modified: trunk/libcatalyst-model-cdbi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/debian/changelog?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/debian/changelog (original)
+++ trunk/libcatalyst-model-cdbi-perl/debian/changelog Wed Feb 10 15:12:59 2010
@@ -1,3 +1,14 @@
+libcatalyst-model-cdbi-perl (0.12-1) unstable; urgency=low
+
+ * New upstream release.
+ + Add (build-)dep on libmro-compat-perl.
+ * debian/copyright: Update years of copyright, minor changes for DEP-5.
+ * debian/control: Add note that this module is deprecated to description.
+ * Use source format 3.0 (quilt).
+ * Bump Standards-Version to 3.8.4 (no changes).
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Thu, 11 Feb 2010 00:12:13 +0900
+
libcatalyst-model-cdbi-perl (0.11-3) unstable; urgency=low
[ Ryan Niebur ]
Modified: trunk/libcatalyst-model-cdbi-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/debian/control?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/debian/control (original)
+++ trunk/libcatalyst-model-cdbi-perl/debian/control Wed Feb 10 15:12:59 2010
@@ -5,15 +5,22 @@
Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
Ansgar Burchardt <ansgar at 43-1.org>
Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl, libcatalyst-perl, libclass-dbi-loader-perl, libclass-dbi-perl, libtest-pod-perl, libtest-pod-coverage-perl
-Standards-Version: 3.8.2
+Build-Depends-Indep: perl, libcatalyst-perl, libclass-dbi-loader-perl,
+ libclass-dbi-perl, libmro-compat-perl,
+ libtest-pod-perl, libtest-pod-coverage-perl
+Standards-Version: 3.8.4
Homepage: http://search.cpan.org/dist/Catalyst-Model-CDBI/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libcatalyst-model-cdbi-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/
Package: libcatalyst-model-cdbi-perl
Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libcatalyst-perl, libclass-dbi-loader-perl, libclass-dbi-perl
+Depends: ${misc:Depends}, ${perl:Depends},
+ libcatalyst-perl, libclass-dbi-loader-perl, libclass-dbi-perl,
+ libmro-compat-perl
Description: CDBI Model Class for Catalyst
This is the Class::DBI model class for Catalyst. It's built on top of
Class::DBI::Loader.
+ .
+ This module is deprecated and only provided for older applications which
+ still need it for backwards compatibility.
Modified: trunk/libcatalyst-model-cdbi-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/debian/copyright?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/debian/copyright (original)
+++ trunk/libcatalyst-model-cdbi-perl/debian/copyright Wed Feb 10 15:12:59 2010
@@ -1,21 +1,21 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Andy Grundman
-Upstream-Source: http://search.cpan.org/dist/Catalyst-Model-CDBI/
-Upstream-Name: Catalyst-Model-CDBI
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Tomas Doran
+Source: http://search.cpan.org/dist/Catalyst-Model-CDBI/
+Name: Catalyst-Model-CDBI
Files: *
-Copyright: © 2005, Sebastian Riedel <sri at cpan.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
-X-Comment: Years of copyright are taken from `Cahnges' file.
+Copyright:
+ © 2005-2010, Sebastian Riedel <sri at cpan.org>
+ © 2005-2010, Matt S Trout <mst at shadowcat.co.uk>
+ © 2005-2010, Matthew Hodgson <matthew at arasphere.net>
+License: Artistic or GPL-1+
Files: debian/*
Copyright:
© 2005, Florian Ragwitz <rafl at debian.org>
© 2005-2008, Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
- © 2009, Ansgar Burchardt <ansgar at 43-1.org>
-License: Artistic | GPL-1+
+ © 2009-2010, Ansgar Burchardt <ansgar at 43-1.org>
+License: Artistic or GPL-1+
License: Artistic
This program is free software; you can redistribute it and/or modify
Added: trunk/libcatalyst-model-cdbi-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/debian/source/format?rev=52455&op=file
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/debian/source/format (added)
+++ trunk/libcatalyst-model-cdbi-perl/debian/source/format Wed Feb 10 15:12:59 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Helper/Model/CDBI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Helper/Model/CDBI.pm?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Helper/Model/CDBI.pm (original)
+++ trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Helper/Model/CDBI.pm Wed Feb 10 15:12:59 2010
@@ -2,6 +2,7 @@
use strict;
use Class::DBI::Loader;
+use Class::DBI;
use File::Spec;
=head1 NAME
Modified: trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Model/CDBI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Model/CDBI.pm?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Model/CDBI.pm (original)
+++ trunk/libcatalyst-model-cdbi-perl/lib/Catalyst/Model/CDBI.pm Wed Feb 10 15:12:59 2010
@@ -1,17 +1,24 @@
package Catalyst::Model::CDBI;
+# work around CDBI being incompatible with C3 mro, due to both Ima::DBI and Class::DBI::__::Base
+# inheriting from Class::Data::Inheritable in an inconsistent order.
+BEGIN {
+ require Class::DBI;
+ @Class::DBI::__::Base::ISA = grep { $_ ne 'Class::Data::Inheritable' } @Class::DBI::__::Base::ISA;
+}
+
use strict;
-use base qw/Catalyst::Base Class::DBI/;
-use NEXT;
+use base qw/Catalyst::Component Class::DBI/;
+use MRO::Compat;
use Class::DBI::Loader;
-our $VERSION = '0.11';
+our $VERSION = '0.12';
__PACKAGE__->mk_accessors('loader');
=head1 NAME
-Catalyst::Model::CDBI - CDBI Model Class
+Catalyst::Model::CDBI - [DEPRECATED] CDBI Model Class
=head1 SYNOPSIS
@@ -42,7 +49,12 @@
=head1 DESCRIPTION
This is the C<Class::DBI> model class. It's built on top of
-C<Class::DBI::Loader>.
+C<Class::DBI::Loader>. C<Class::DBI> is generally not used for new
+applications, with C<DBIx::Class> being preferred instead. As such
+this model is deprecated and (mostly) unmaintained.
+
+It is preserved here for older applications which still need it for
+backwards compatibility.
=head2 new
@@ -53,7 +65,7 @@
sub new {
my $class = shift;
- my $self = $class->NEXT::new( @_ );
+ my $self = $class->next::method( @_ );
my $c = shift;
$self->{namespace} ||= ref $self;
$self->{additional_base_classes} ||= ();
@@ -84,7 +96,16 @@
Sebastian Riedel, C<sri at cpan.org>
+=head1 CONTRIBUTORS
+
+mst: Matt S Trout C<mst at shadowcat.co.uk>
+
+Arathorn: Matthew Hodgson C<matthew at arasphere.net>
+
=head1 COPYRIGHT
+
+Copyright (c) 2005 - 2010 the Catalyst::Model::CDBI L</AUTHOR> and
+L</CONTRIBUTORS> as listed above.
This program is free software, you can redistribute it and/or modify it
under the same terms as Perl itself.
Modified: trunk/libcatalyst-model-cdbi-perl/t/01use.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-model-cdbi-perl/t/01use.t?rev=52455&op=diff
==============================================================================
--- trunk/libcatalyst-model-cdbi-perl/t/01use.t (original)
+++ trunk/libcatalyst-model-cdbi-perl/t/01use.t Wed Feb 10 15:12:59 2010
@@ -1,5 +1,8 @@
use strict;
-use Test::More tests => 2;
+use Test::More tests => 3;
BEGIN { use_ok('Catalyst::Model::CDBI') }
BEGIN { use_ok('Catalyst::Helper::Model::CDBI') }
+
+use MRO::Compat;
+ok(eval { mro::get_linear_isa('Catalyst::Model::CDBI'); 1 }, 'Linearise ok');
More information about the Pkg-perl-cvs-commits
mailing list