r53776 - in /trunk/libcatalyst-modules-extra-perl: debian/changelog debian/copyright tarballs/01/Catalyst-Model-Adaptor-0.05.tar.gz tarballs/01/Catalyst-Model-Adaptor-0.08.tar.gz tarballs/check-upstream-versions tarballs/packages.cfg

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Sun Mar 7 00:44:10 UTC 2010


Author: jawnsy-guest
Date: Sun Mar  7 00:44:02 2010
New Revision: 53776

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53776
Log:
* Updated modules:
  + Catalyst::Model::Adaptor 0.08 (was 0.05)
* Changed to the new DEP5 copyright format
* Copy build script from libcatalyst-modules-perl

Added:
    trunk/libcatalyst-modules-extra-perl/tarballs/01/Catalyst-Model-Adaptor-0.08.tar.gz   (with props)
Removed:
    trunk/libcatalyst-modules-extra-perl/tarballs/01/Catalyst-Model-Adaptor-0.05.tar.gz
Modified:
    trunk/libcatalyst-modules-extra-perl/debian/changelog
    trunk/libcatalyst-modules-extra-perl/debian/copyright
    trunk/libcatalyst-modules-extra-perl/tarballs/check-upstream-versions
    trunk/libcatalyst-modules-extra-perl/tarballs/packages.cfg

Modified: trunk/libcatalyst-modules-extra-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/debian/changelog?rev=53776&op=diff
==============================================================================
--- trunk/libcatalyst-modules-extra-perl/debian/changelog (original)
+++ trunk/libcatalyst-modules-extra-perl/debian/changelog Sun Mar  7 00:44:02 2010
@@ -1,8 +1,15 @@
 libcatalyst-modules-extra-perl (5) UNRELEASED; urgency=low
 
+  [ Jonathan Yu ]
+  * Updated modules:
+    + Catalyst::Model::Adaptor 0.08 (was 0.05)
+  * Changed to the new DEP5 copyright format
+  * Copy build script from libcatalyst-modules-perl
+
+  [ gregor herrmann ]
   * Improve build script.
 
- -- gregor herrmann <gregoa at debian.org>  Fri, 29 Jan 2010 15:12:47 +0100
+ -- Jonathan Yu <jawnsy at cpan.org>  Sat, 06 Mar 2010 20:06:39 -0500
 
 libcatalyst-modules-extra-perl (4) unstable; urgency=low
 

Modified: trunk/libcatalyst-modules-extra-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/debian/copyright?rev=53776&op=diff
==============================================================================
--- trunk/libcatalyst-modules-extra-perl/debian/copyright (original)
+++ trunk/libcatalyst-modules-extra-perl/debian/copyright Sun Mar  7 00:44:02 2010
@@ -1,48 +1,48 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
 
 Files: debian/*, tarballs/check-upstream-versions, tarballs/packages.cfg
-Copyright: 2009, Jonathan Yu <frequency at cpan.org>
+Copyright: 2009-2010, Jonathan Yu <frequency at cpan.org>
  2006, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
-Files: tarballs/01/Catalyst-Model-Adaptor-0.05.tar.gz
+Files: tarballs/01/Catalyst-Model-Adaptor-0.08.tar.gz
 Copyright: 2007, Jonathan Rockway <jrockway at cpan.org>
 X-Upstream-Maintainers: Florian Ragwitz <rafl at debian.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: tarballs/01/Catalyst-Model-CDBI-CRUD-0.04.tar.gz
 Copyright: 2005-2009, Sebastian Riedel <sri at cpan.org>
  2005-2009, Catalyst Core Team
 X-Upstream-Maintainers: Marcus Ramberg <mramberg at cpan.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: tarballs/01/Catalyst-Plugin-Authentication-Credential-OpenID-0.03.tar.gz
 Copyright: 2006-2007, Tatsuhiko Miyagawa <miyagawa at bulknews.net>
 X-Upstream-Maintainers: Tatsuhiko Miyagawa <miyagawa at bulknews.net>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: tarballs/01/Catalyst-Plugin-Captcha-0.03.tar.gz
 Copyright: 2006, Masahiro Nagano <kazeburo at nomadscafe.jp>
 X-Upstream-Maintainers: Masahiro Nagano <kazeburo at nomadscafe.jp>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: tarballs/01/Catalyst-Plugin-Setenv-0.03.tar.gz
 Copyright: 2006, Jonathan Rockway <jrockway at cpan.org>
 X-Upstream-Maintainers: Marcus Ramberg <mramberg at cpan.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
 
 License: GPL-1+
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'

Added: trunk/libcatalyst-modules-extra-perl/tarballs/01/Catalyst-Model-Adaptor-0.08.tar.gz
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/tarballs/01/Catalyst-Model-Adaptor-0.08.tar.gz?rev=53776&op=file
==============================================================================
Binary file - no diff available.

Propchange: trunk/libcatalyst-modules-extra-perl/tarballs/01/Catalyst-Model-Adaptor-0.08.tar.gz
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: trunk/libcatalyst-modules-extra-perl/tarballs/check-upstream-versions
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/tarballs/check-upstream-versions?rev=53776&op=diff
==============================================================================
--- trunk/libcatalyst-modules-extra-perl/tarballs/check-upstream-versions (original)
+++ trunk/libcatalyst-modules-extra-perl/tarballs/check-upstream-versions Sun Mar  7 00:44:02 2010
@@ -99,7 +99,22 @@
 					print "$key not exist in config file or has not defined 'maintainer' section\n";					
 					exit(1);
 				}
-				$coutput .= qq{License: Artistic | GPL-1+\n};
+				$coutput .= qq{License: Artistic or GPL-1+\n};
+				if (defined $config->{$key}->{'comment'})
+				{
+					$coutput .= qq{X-Comment:};
+					if (ref $config->{$key}->{'comment'} eq 'ARRAY')
+					{
+						foreach my $comment (@{$config->{$key}->{'comment'}})
+						{
+							$coutput .= qq{ $comment\n};
+						}
+					}
+					else
+					{
+						$coutput .= qq{ $config->{$key}->{'comment'}\n};
+					}
+				}
 			}
 			last;
 		}				
@@ -153,7 +168,8 @@
 							
 			my @found = $indexes{$u_dir} =~ m!$u_file!g;
 			$upstream_version = maxstr(@found);
-			$upstream_link = qq{$u_dir/$base-$upstream_version.tar.gz}; 
+			my @links = $indexes{$u_dir} =~ m!"(/CPAN/.+$base-$upstream_version.+)"!;
+			$upstream_link = qq{http://search.cpan.org$links[0]}; 
 		}
 		else
 		{
@@ -205,3 +221,4 @@
 	my @f = bsd_glob('??/*.tar.gz');
 	check( \@f, \%cfg );
 }
+

Modified: trunk/libcatalyst-modules-extra-perl/tarballs/packages.cfg
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-extra-perl/tarballs/packages.cfg?rev=53776&op=diff
==============================================================================
--- trunk/libcatalyst-modules-extra-perl/tarballs/packages.cfg (original)
+++ trunk/libcatalyst-modules-extra-perl/tarballs/packages.cfg Sun Mar  7 00:44:02 2010
@@ -1,28 +1,29 @@
+
 debcopystart <<EOF
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
 
 Files: debian/*, tarballs/check-upstream-versions, tarballs/packages.cfg
-Copyright: 2009, Jonathan Yu <frequency at cpan.org>
+Copyright: 2009-2010, Jonathan Yu <frequency at cpan.org>
  2006, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 EOF
 
 debcopyright <<EOF
 License: Artistic
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the Artistic License, which comes with Perl.
-    On Debian GNU/Linux systems, the complete text of the Artistic License
-    can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
 
 License: GPL-1+
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 1, or (at your option)
-    any later version.
-    On Debian GNU/Linux systems, the complete text of the GNU General
-    Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
 EOF
 
 <Catalyst-Model-CDBI-CRUD>




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