r60039 - in /trunk/libclass-dbi-loader-relationship-perl: Changes META.yml Relationship.pm debian/changelog debian/control debian/copyright debian/patches/01_camel_case_bug_330088.diff debian/watch test.pl
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Sun Jul 4 16:17:01 UTC 2010
Author: ansgar-guest
Date: Sun Jul 4 16:16:50 2010
New Revision: 60039
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60039
Log:
* Re-introduce version 1.2 to Debian. (Closes: #566303, #587972)
+ We now have a license to distribute this module. (Closes: #563519)
+ Bump epoch.
* Bump Standards-Version to 3.9.0.
Modified:
trunk/libclass-dbi-loader-relationship-perl/Changes
trunk/libclass-dbi-loader-relationship-perl/META.yml
trunk/libclass-dbi-loader-relationship-perl/Relationship.pm
trunk/libclass-dbi-loader-relationship-perl/debian/changelog
trunk/libclass-dbi-loader-relationship-perl/debian/control
trunk/libclass-dbi-loader-relationship-perl/debian/copyright
trunk/libclass-dbi-loader-relationship-perl/debian/patches/01_camel_case_bug_330088.diff
trunk/libclass-dbi-loader-relationship-perl/debian/watch
trunk/libclass-dbi-loader-relationship-perl/test.pl
Modified: trunk/libclass-dbi-loader-relationship-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/Changes?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/Changes (original)
+++ trunk/libclass-dbi-loader-relationship-perl/Changes Sun Jul 4 16:16:50 2010
@@ -1,7 +1,4 @@
Revision history for Perl extension Class::DBI::Loader::Relationship.
-
-1.3 Tue Nov 9 09:00:00 GMT 2005
- - add support for mapper alias (chunzi)
See
http://cvs.simon-cozens.org/viewcvs.cgi/Class-DBI-Loader-Relationship/
Modified: trunk/libclass-dbi-loader-relationship-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/META.yml?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/META.yml (original)
+++ trunk/libclass-dbi-loader-relationship-perl/META.yml Sun Jul 4 16:16:50 2010
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Class-DBI-Loader-Relationship
-version: 1.3
+version: 1.2
version_from: Relationship.pm
installdirs: site
requires:
@@ -9,4 +9,4 @@
Lingua::EN::Inflect::Number: 1
distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+generated_by: ExtUtils::MakeMaker version 6.21
Modified: trunk/libclass-dbi-loader-relationship-perl/Relationship.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/Relationship.pm?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/Relationship.pm (original)
+++ trunk/libclass-dbi-loader-relationship-perl/Relationship.pm Sun Jul 4 16:16:50 2010
@@ -2,14 +2,14 @@
use 5.006;
use strict;
use warnings;
-our $VERSION = '1.3';
+our $VERSION = '1.2';
our $DEBUG = 0;
1;
=head1 NAME
-Class::DBI::Loader::Relationship - Easier relationship specification in CDBI::Loader
+Class::DBI::Loader::Relationship - Easier relationship specification in CDBI::L
=head1 SYNOPSIS
@@ -28,21 +28,10 @@
BeerDB::Pub->has_many(beers => [ BeerDB::Handpump => 'beer' ]);
BeerDB::Beer->has_many(pubs => [ BeerDB::Handpump => 'pub' ]);
-
Just say
$loader->relationship( "a brewery produces beers" );
$loader->relationship( "a pub has beers on handpumps" );
-
-And something like ( upgraded in v1.3 )
-
- MyApp::Page->has_a( author => 'MyApp::User' );
- MyApp::Page->has_many( revisions => 'MyApp::PageRevision' );
-
-Just say
-
- $loader->relationship( "a page has an user as author" );
- $loader->relationship( "a page has many page_revisions as revisions" );
=head1 DESCRIPTION
@@ -87,9 +76,6 @@
my $to = $tables{$1};
my $to_c = $self->find_class($to);
my $mapper = $method eq "has_many" ? to_PL($to) : to_S($to);
-
- $mapper = $1 if $text =~ s/\s+as\s+(\w+)$//i;
-
if ($text =~ /($table_re)/i) {
my $via = $tables{$1}; my $via_c = $self->find_class($via);
return "$via_c->has_a(".to_S($from)." => $from_c)\n".
@@ -117,8 +103,6 @@
Simon Cozens, C<simon at cpan.org>
-Chunzi, C<chunzi at perlchina.org>
-
=head1 SEE ALSO
L<Class::DBI::Loader>.
Modified: trunk/libclass-dbi-loader-relationship-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/debian/changelog?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/debian/changelog (original)
+++ trunk/libclass-dbi-loader-relationship-perl/debian/changelog Sun Jul 4 16:16:50 2010
@@ -1,6 +1,16 @@
-libclass-dbi-loader-relationship-perl (1.3-3) UNRELEASED; urgency=low
+libclass-dbi-loader-relationship-perl (1:1.2-1) unstable; urgency=low
- TODO: Where does the license information in d/copyright come from?
+ [ Ansgar Burchardt ]
+ * Re-introduce version 1.2 to Debian. (Closes: #566303, #587972)
+ + We now have a license to distribute this module. (Closes: #563519)
+ + Bump epoch.
+ * Use source format 3.0 (quilt).
+ * Use debhelper instead of CDBS.
+ * Convert debian/copyright to proposed machine-readable format.
+ * Add myself to Uploaders.
+ * Bump Standards-Version to 3.9.0.
+ * debian/control: Mention module name in description.
+ * No longer install README.
[ Ryan Niebur ]
* moved with permission from Bart (Closes: #531512)
@@ -21,19 +31,7 @@
perl (>= 5.6.0-{12,16}) with an unversioned dependency on perl (as
permitted by Debian Policy 3.8.3).
- [ gregor herrmann ]
- * debian/watch: add author-URL to catch the version we actually have.
-
- [ Ansgar Burchardt ]
- * Use source format 3.0 (quilt).
- * Use debhelper instead of CDBS.
- * Convert debian/copyright to proposed machine-readable format.
- * Add myself to Uploaders.
- * Bump Standards-Version to 3.8.3.
- * debian/control: Mention module name in description.
- * No longer install README.
-
- -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 04 Jan 2010 00:01:46 +0900
+ -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 05 Jul 2010 01:14:41 +0900
libclass-dbi-loader-relationship-perl (1.3-2) unstable; urgency=low
Modified: trunk/libclass-dbi-loader-relationship-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/debian/control?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/debian/control (original)
+++ trunk/libclass-dbi-loader-relationship-perl/debian/control Sun Jul 4 16:16:50 2010
@@ -5,7 +5,7 @@
Uploaders: Ansgar Burchardt <ansgar at 43-1.org>
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: perl, libclass-dbi-loader-perl, liblingua-en-inflect-number-perl (>= 1), libtest-simple-perl
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/
Homepage: http://search.cpan.org/~chunzi/Class-DBI-Loader-Relationship/
Modified: trunk/libclass-dbi-loader-relationship-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/debian/copyright?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/debian/copyright (original)
+++ trunk/libclass-dbi-loader-relationship-perl/debian/copyright Sun Jul 4 16:16:50 2010
@@ -1,23 +1,32 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Maintainer: chunzi
-Source: http://search.cpan.org/~chunzi/Class-DBI-Loader-Relationship/
+Maintainer: Simon Cozens <simon at simon-cozens.org>
+Source: http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
Name: Class-DBI-Loader-Relationship
-Copyright:
- XXX: Where does this information come from?
- It was in the old debian/copyright, but I did not find it
- anywhere else -- ansgar
- © 2003-2004, Simon Cozens <simon at simon-cozens.org>
- © 2005, Chunzi <chunzi at perlchina.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 2003-2004, Simon Cozens <simon at simon-cozens.org>
+License: Artistic or GPL-1+
+X-Comment:
+ The license grant below is taken from http://bugs.debian.org/563519#46
+ .
+ From: Simon Cozens <simon at simon-cozens.org>
+ Subject: Re: cpan module
+ Date: Sun, 04 Jul 2010 12:53:42 +0100
+ .
+ On 03/07/2010 14:01, Ben Hutchings wrote:
+ > Simon, could you please give us permission to distribute version 1.2
+ > under GPL/AL?
+ .
+ Yes, I am happy for you to distribute under those terms.
+ .
+ Thanks,
+ Simon
Files: debian/*
Copyright:
© 2004-2005, Stephen Quinney <sjq at debian.org>
© 2006-2008, Bart Martens <bartm at debian.org>
© 2010, Ansgar Burchardt <ansgar at 43-1.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
License: Artistic
This program is free software; you can redistribute it and/or modify
Modified: trunk/libclass-dbi-loader-relationship-perl/debian/patches/01_camel_case_bug_330088.diff
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/debian/patches/01_camel_case_bug_330088.diff?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/debian/patches/01_camel_case_bug_330088.diff (original)
+++ trunk/libclass-dbi-loader-relationship-perl/debian/patches/01_camel_case_bug_330088.diff Sun Jul 4 16:16:50 2010
@@ -1,6 +1,11 @@
-diff -urNad libclass-dbi-loader-relationship-perl-1.2~/Relationship.pm libclass-dbi-loader-relationship-perl-1.2/Relationship.pm
---- libclass-dbi-loader-relationship-perl-1.2~/Relationship.pm 2004-03-01 16:48:45.000000000 +0000
-+++ libclass-dbi-loader-relationship-perl-1.2/Relationship.pm 2005-10-12 09:51:07.000000000 +0100
+From: Stephen Quinney <sjq at debian.org>
+Date: Wed, 12 Oct 2005 09:55:45 +0100
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/330088
+Subject: Problem with CamelCase classes and underscores in table names
+
+--- libclass-dbi-loader-relationship-perl.orig/Relationship.pm
++++ libclass-dbi-loader-relationship-perl/Relationship.pm
@@ -93,8 +93,8 @@
return "$from_c->$method($mapper => $to_c);\n".
($method ne "has_a" && "$to_c->has_a(".to_S($from)." => $from_c);\n")
Modified: trunk/libclass-dbi-loader-relationship-perl/debian/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/debian/watch?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/debian/watch (original)
+++ trunk/libclass-dbi-loader-relationship-perl/debian/watch Sun Jul 4 16:16:50 2010
@@ -1,4 +1,2 @@
version=3
http://search.cpan.org/dist/Class-DBI-Loader-Relationship/ .*/Class-DBI-Loader-Relationship-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
-http://search.cpan.org/~chunzi/Class-DBI-Loader-Relationship/ .*/Class-DBI-Loader-Relationship-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
-
Modified: trunk/libclass-dbi-loader-relationship-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-dbi-loader-relationship-perl/test.pl?rev=60039&op=diff
==============================================================================
--- trunk/libclass-dbi-loader-relationship-perl/test.pl (original)
+++ trunk/libclass-dbi-loader-relationship-perl/test.pl Sun Jul 4 16:16:50 2010
@@ -32,5 +32,3 @@
EOF
test("pubs have beer on handpumps", $crib2);
-
-test("a brewery has a beer as another_beer", "BeerDB::Brewery->has_a(another_beer => BeerDB::Beer);\n");
More information about the Pkg-perl-cvs-commits
mailing list