r55761 - in /trunk/libdbi-perl/debian: changelog copyright

gregoa at users.alioth.debian.org gregoa at users.alioth.debian.org
Thu Apr 8 21:24:49 UTC 2010


Author: gregoa
Date: Thu Apr  8 21:24:43 2010
New Revision: 55761

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55761
Log:
debian/copyright: update formatting and upstream copyright years.

Modified:
    trunk/libdbi-perl/debian/changelog
    trunk/libdbi-perl/debian/copyright

Modified: trunk/libdbi-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/changelog?rev=55761&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/changelog (original)
+++ trunk/libdbi-perl/debian/changelog Thu Apr  8 21:24:43 2010
@@ -17,6 +17,7 @@
   * Build needs Test::Simple 0.84.
   * Refresh patch t__40profile.t__NTP.patch.
   * Convert to source format 3.0 (quilt). Remove quilt framework.
+  * debian/copyright: update formatting and upstream copyright years.
 
  -- gregor herrmann <gregoa at debian.org>  Thu, 08 Apr 2010 23:11:51 +0200
 

Modified: trunk/libdbi-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbi-perl/debian/copyright?rev=55761&op=diff
==============================================================================
--- trunk/libdbi-perl/debian/copyright (original)
+++ trunk/libdbi-perl/debian/copyright Thu Apr  8 21:24:43 2010
@@ -1,196 +1,153 @@
-Format-Specification:
-    http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Tim Bunce <Tim.Bunce at pobox.com>
-Upstream-Source: http://dbi.perl.org
-Upstream-Name: DBI
-
-Christian Schwarz <schwarz at debian.org> originally put together this package
-from original DBI sources.  It was then taken over by Ben Gertzfield, then
-Martin Schulze and then Christian Hammers. Current maintainer is Debian Perl
-Group.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Tim Bunce <Tim.Bunce at pobox.com>
+Source: http://search.cpan.org/dist/DBI/
+Name: DBI
 
 Files: DBI.pm
-Copyright: 1994-2009, Tim Bunce <Tim.Bunce at pobox.com>
+Copyright: 1994-2010, Tim Bunce <Tim.Bunce at pobox.com>
 License-Alias: Perl
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: DBI.xs
 Copyright: 1994-2003, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- See COPYRIGHT section in DBI.pm for usage and distribution rights.
+License: GPL-1+ or Artistic
 
 Files: DBIXS.h
 Copyright: 1994-2002, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- See COPYRIGHT section in DBI.pm for usage and distribution rights.
+License: GPL-1+ or Artistic
 
 Files: Driver.xst
 Copyright: 1997-2002, Tim Bunce <Tim.Bunce at pobox.com>
  2002, Jonathan Leffler <j.leffler at acm.org>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: Makefile.PL
 Copyright: 1994-2006, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- See COPYRIGHT section in DBI.pm for usage and distribution rights.
+License: GPL-1+ or Artistic
 
 Files: dbd_xsh.h
 Copyright: 2000-2002, Tim Bunce <Tim.Bunce at pobox.com>
  2002, Jonathan Leffler <j.leffler at acm.org>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: dbi_sql.h
 Copyright: 1997-1999, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- See COPYRIGHT section in DBI.pm for usage and distribution rights.
+License: GPL-1+ or Artistic
 
 Files: dbipport.h
 Copyright: 2004-2009, Marcus Holland-Moritz <mhx-cpan at gmx.net>
  2001, Paul Marquess <pmqs at cpan.org> (Version 2.x)
  1999, Kenneth Albanowski <kjahds at kjahds.com> (Version 1.x)
 License-Alias: Perl
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
 
 Files: dbiprof.PL
 Copyright: 2002, Sam Tregar <sam at tregar.com>
-License: GPL-1+ | Artistic
- This program is free software; you can redistribute it and/or modify
- it under the same terms as Perl 5 itself.
+License: GPL-1+ or Artistic
 
 Files: dbiproxy.PL, lib/DBI/ProxyServer.pm
 Copyright: 1997, Jochen Wiedmann <jwied at cpan.org>
-License: GPL-1+ | Artistic
- The DBI::ProxyServer module is free software; you can redistribute it
- and/or modify it under the same terms as Perl itself. In particular
- permission is granted to Tim Bunce for distributing this as a part of
- the DBI.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/Gofer/*, lib/DBI/Util/CacheMemory.pm, lib/DBI/Util/CacheMemory.pm
 Copyright: 2007, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/Gofer/Transport/Base.pm
 Copyright: 2007-2008, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- This module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself. See 'perldoc perlartistic'.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/Const/*
 Copyright: 2002, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/DBD.pm
 Copyright: 1997-2006, Tim Bunce <Tim.Bunce at pobox.com>
  1997-2006, Jochen Wiedmann <jwied at cpan.org>
  1997-2006, Jonathan Leffler <j.leffler at acm.org>
  1997-2006, Steffen Goeldner <sgoeldner at cpan.org>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/W32ODBC.pm
 Copyright: 1997, 1999 by Tim Bunce <Tim.Bunce at pobox.com>
- With many thanks to Patrick Hollins for polishing.
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/FAQ.pm
-Copyright: This document is Copyright (c)1994-2000 Alligator Descartes, 
- with portions Copyright (c)1994-2000 their original authors.
+Copyright: 1994-2000, Alligator Descartes
 License: Artistic
- This module is released under the 'Artistic' license which you can find in
- the perl distribution.
 
 Files: lib/DBI/SQL/Nano.pm, lib/DBD/DBM.pm
-Copyright: (c) 2004 by Jeff Zucker < jzucker AT cpan.org > All rights reserved.
-License: GPL-1+ | Artistic
- You may freely distribute and/or modify this  module under the terms
- of either the GNU  General Public License (GPL) or the Artistic License,
- as specified in the Perl README file.
+Copyright: 2004, Jeff Zucker <jzucker at cpan.org>
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/ProfileData.pm, lib/DBI/ProfileDumper/Apache.pm,
  lib/DBI/ProfileDumper.pm
 Copyright: 2002, Sam Tregar <sam at tregar.com>
-License: GPL-1+ | Artistic
- This program is free software; you can redistribute it and/or modify
- it under the same terms as Perl 5 itself.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/PurePerl.pm
 Copyright: 2002-2003, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- See COPYRIGHT section in DBI.pm for usage and distribution rights.
+License: GPL-1+ or Artistic
 
 Files: lib/DBI/DBD/Metadata.pm
 Copyright: 1997-2003, Tim Bunce <Tim.Bunce at pobox.com>
  1997-2003, Jochen Wiedmann <jwied at cpan.org>
  1997-2003, Jonathan Leffler <j.leffler at acm.org>
  1997-2003, Steffen Goeldner <sgoeldner at cpan.org>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: lib/DBD/ExampleP.pm
 Copyright: 1994,1997,1998 Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: lib/DBD/File.pm
 Copyright:
- 2009 by H.Merijn Brand & Jens Rehsack
- (C) 2004 by Jeff Zucker
- (C) 1998 by Jochen Wiedmann
- All rights reserved.
-License: GPL-1+ | Artistic
- You may distribute this module under the terms of either the GNU
- General Public License or the Artistic License, as specified in
- the Perl README file.
+ 2009, H.Merijn Brand
+ 2009, Jens Rehsack
+ 2004, Jeff Zucker
+ 1998, Jochen Wiedmann
+License: GPL-1+ or Artistic
 
 Files: lib/DBD/NullP.pm
 Copyright: 1994-2007, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: lib/DBD/Proxy.pm
-Copyright: (c) 1997,1998  Jochen Wiedmann
-License: GPL-1+ | Artistic
- The DBD::Proxy module is free software; you can redistribute it and/or
- modify it under the same terms as Perl itself. In particular permission
- is granted to Tim Bunce for distributing this as a part of the DBI.
+Copyright: 1997,1998, Jochen Wiedmann
+License: GPL-1+ or Artistic
 
 Files: lib/DBD/Sponge.pm
 Copyright: 1994-2003, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file.
+License: GPL-1+ or Artistic
 
 Files: test.pl
 Copyright: 1994-1998, Tim Bunce <Tim.Bunce at pobox.com>
-License: GPL-1+ | Artistic
- See COPYRIGHT section in DBI.pm for usage and distribution rights.
+License: GPL-1+ or Artistic
+
+Files: debian/*
+Copyright: 1997, 1998, 1999, Martin Schulze <joey at finlandia.infodrom.north.de>
+ 1997, 1998, Ben Gertzfield <che at debian.org>
+ 1997, Christian Schwarz <schwarz at debian.org>
+ 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, Christian Hammers <ch at debian.org>
+ 2002, Dirk Eddelbuettel <edd at debian.org>
+ 2007, 2008, 2009, Damyan Ivanov <dmn at debian.org>
+ 2008, 2010, gregor herrmann <gregoa at debian.org>
+ 2008, Niko Tyni <ntyni at debian.org>
+ 2009, Ryan Niebur <ryan at debian.org>
+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'




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