r13266 - in /trunk/libaudio-flac-header-perl/debian: changelog copyright

[ntyni at users.alioth.debian.org]

Author: ntyni
Date: Tue Jan 22 12:35:17 2008
New Revision: 13266

URL: http://svn.debian.org/wsvn/?sc=1&rev=13266
Log:
* Update and reformat debian/copyright.

Modified:
    trunk/libaudio-flac-header-perl/debian/changelog
    trunk/libaudio-flac-header-perl/debian/copyright

Modified: trunk/libaudio-flac-header-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libaudio-flac-header-perl/debian/changelog?rev=13266&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/changelog (original)
+++ trunk/libaudio-flac-header-perl/debian/changelog Tue Jan 22 12:35:17 2008
@@ -1,6 +1,4 @@
 libaudio-flac-header-perl (1.9-1) UNRELEASED; urgency=low
-
-  TODO: convert debian/copyright format? Header.xs is only GPL-2 (not Artistic)
 
   * New upstream release.
   * New maintainer. (Closes: #455922)
@@ -19,7 +17,7 @@
     for the test suite.
   * Manage debian/patches with quilt.
     + pod-coverage-private: fix a test failure with Pod::Coverage 0.19.
-  * Update debian/copyright.
+  * Update and reformat debian/copyright.
 
  -- Niko Tyni <ntyni at debian.org>  Tue, 22 Jan 2008 13:18:45 +0200
 

Modified: trunk/libaudio-flac-header-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libaudio-flac-header-perl/debian/copyright?rev=13266&op=diff
==============================================================================
--- trunk/libaudio-flac-header-perl/debian/copyright (original)
+++ trunk/libaudio-flac-header-perl/debian/copyright Tue Jan 22 12:35:17 2008
@@ -10,20 +10,51 @@
   Erik Reckase <cerebusjam at hotmail.com>
   with lots of help from Dan Sully <daniel at cpan.org> for XS code.
 
-Copyright and license:
-
-  Pure perl code Copyright (c) 2003-2004, Erik Reckase.
-  Pure perl code Copyright (c) 2003-2007, Dan Sully & Slim Devices.
-  XS code Copyright (c) 2004-2007, Dan Sully & Slim Devices.
-
+Files: *
+Copyright: Pure perl code Copyright (c) 2003-2004, Erik Reckase.
+           Pure perl code Copyright (c) 2003-2007, Dan Sully & Slim Devices.
+           XS code Copyright (c) 2004-2007, Dan Sully & Slim Devices.
+License: Artistic | GPL-1+
   This library is free software; you can redistribute it and/or modify
   it under the same terms as Perl itself, either Perl version 5.8.2 or,
   at your option, any later version of Perl 5 you may have available.
 
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License.  On Debian GNU/Linux systems, the complete text of the
-GNU General Public License can be found in `/usr/share/common-licenses/GPL'
-and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+Files: Header.xs
+Copyright: XS code Copyright (c) 2004-2007, Dan Sully & Slim Devices.
+License: GPL-2+
+ 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 2
+ of the License, or (at your option) any later version.
+ .
+ Chunks of this code have been borrowed and influenced from the FLAC source.
+
+Files: inc/*
+Copyright: Copyright 2002, 2003, 2004, 2005, 2006 by
+    Audrey Tang <autrijus at autrijus.org>
+    Brian Ingerson <ingy at cpan.org>
+    Adam Kennedy <adamk at cpan.org>
+License: Artistic | GPL-1+
+ All rights reserved.  You can redistribute and/or modify
+ this bundle under the same terms as Perl itself.
+ .
+ [These files are from the Module::Install module; although they lack
+  explicit copyright and license notices, it is assumed that the license
+  and copyright of that package applies to them.]
+
+Files: debian/*
+Copyright: (c) 2004-2005 Ivo Marino <eim at mentors.debian.net>
+           (c) 2008      Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+           (c) 2008      Niko Tyni <ntyni at debian.org>
+License: other
+ It is assumed that all the Debian package maintainers have chosen a license compatible 
+ with upstream's license.
+
+Perl, including version 5.8.2, is distributed under your choice of the
+GNU General Public License or the Artistic License.  On Debian GNU/Linux
+systems, the complete text of the GNU General Public License can be
+found in `/usr/share/common-licenses/GPL' and the Artistic Licence in
+`/usr/share/common-licenses/Artistic'.
 
 The license of Perl itself can be found in /usr/share/doc/perl/copyright.