r26769 - in /trunk/libexception-class-trycatch-perl/debian: changelog copyright

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Wed Nov 12 19:02:26 2008
New Revision: 26769

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26769
Log:
debian/copyright: add Upstream-Name field and reflect upstream's
re-licencing under the Apache 2.0 License.

Modified:
    trunk/libexception-class-trycatch-perl/debian/changelog
    trunk/libexception-class-trycatch-perl/debian/copyright

Modified: trunk/libexception-class-trycatch-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libexception-class-trycatch-perl/debian/changelog?rev=26769&op=diff
==============================================================================
--- trunk/libexception-class-trycatch-perl/debian/changelog (original)
+++ trunk/libexception-class-trycatch-perl/debian/changelog Wed Nov 12 19:02:26 2008
@@ -10,6 +10,8 @@
   [ gregor herrmann ]
   * debian/rules: use the template from dh-make-perl
   * Don't install README any more (text version of POD documentation).
+  * debian/copyright: add Upstream-Name field and reflect upstream's
+    re-licencing under the Apache 2.0 License.
 
  -- Jose Luis Rivas <ghostbar38 at gmail.com>  Tue, 04 Nov 2008 00:37:35 -0430
 

Modified: trunk/libexception-class-trycatch-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libexception-class-trycatch-perl/debian/copyright?rev=26769&op=diff
==============================================================================
--- trunk/libexception-class-trycatch-perl/debian/copyright (original)
+++ trunk/libexception-class-trycatch-perl/debian/copyright Wed Nov 12 19:02:26 2008
@@ -1,6 +1,7 @@
 Format-Specification:
     http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
 Upstream-Author: David A Golden <dagolden at cpan.org>
+Upstream-Name: Exception-Class-TryCatch
 Packaged-By: Jaldhar H. Vyas <jaldhar at debian.org>
 Original-Source-Location: http://search.cpan.org/dist/Exception-Class-TryCatch/
 Original-Source-Command: uscan --force-download
@@ -8,16 +9,31 @@
 
 Files: *
 Copyright © 2004-2008 by David A. Golden
-License: GPL-1+ | Artistic
- This program is free software; you can redistribute
- it and/or modify it under the same terms as Perl itself.
+License: Apache
 
 Files: debian/*
 Copyright: © 2008 Jaldhar H. Vyas <jaldhar at debian.org>
            © 2008 Jose Luis Rivas <ghostbar38 at gmail.com>
 License: GPL-1+ | Artistic
 
-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'.
+License: Apache
+    Licensed under Apache License, Version 2.0 (the "License"). You may not
+    use this file except in compliance with the License. A copy of the
+    License was distributed with this file or you may obtain a copy of the
+    License from http://www.apache.org/licenses/LICENSE-2.0
+    On Debian GNU/Linux systems, the complete text of the Apache License,
+    Version 2.0 can be found in /usr/share/common-licenses/Apache-2.0
+
+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
+
+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'