r11256 - in /trunk/libset-scalar-perl/debian: changelog copyright

[tincho-guest at users.alioth.debian.org]

Author: tincho-guest
Date: Mon Dec 17 01:22:30 2007
New Revision: 11256

URL: http://svn.debian.org/wsvn/?sc=1&rev=11256
Log:
- Merged unreleased changelog entry.
- Applied changes to debian/copyright mimicking what Damyan did to libwww-perl.

Modified:
    trunk/libset-scalar-perl/debian/changelog
    trunk/libset-scalar-perl/debian/copyright

Modified: trunk/libset-scalar-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libset-scalar-perl/debian/changelog?rev=11256&op=diff
==============================================================================
--- trunk/libset-scalar-perl/debian/changelog (original)
+++ trunk/libset-scalar-perl/debian/changelog Mon Dec 17 01:22:30 2007
@@ -1,15 +1,4 @@
 libset-scalar-perl (1.22-1) unstable; urgency=low
-
-  * New upstream release.
-  * debian/control:
-    + Add to the Description field the (just added) ability of computing power
-      sets and cartesian products.
-  * debian/copyright:
-    + Updated the (outdated) upstream copyright years.
-
- -- Martín Ferrari <martin.ferrari at gmail.com>  Sun, 16 Dec 2007 22:06:23 -0300
-
-libset-scalar-perl (1.20-2) UNRELEASED; urgency=low
 
   [ Damyan Ivanov ]
   * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -17,18 +6,21 @@
     Homepage pseudo-field (Description).
 
   [ Martín Ferrari ]
+  * New upstream release.
   * debian/control:
     + Set the perl group as Maintainer, moving José to Uploaders.
     + Bumped Standards-Version (no changes needed).
     + Changed Description to actually name the main module, and provide a
-      clearer description of it.
+      clearer description of it, including the (just added) ability of
+      computing power sets and cartesian products.
   * debian/watch:
     + Use by-dist url, and correctly match versions.
   * debian/copyright:
     + Use the new parseable format.
     + Added myself as contributor.
+    + Updated the (outdated) upstream copyright years.
 
- -- Martín Ferrari <martin.ferrari at gmail.com>  Sun, 16 Dec 2007 21:42:25 -0300
+ -- Martín Ferrari <martin.ferrari at gmail.com>  Sun, 16 Dec 2007 22:06:23 -0300
 
 libset-scalar-perl (1.20-1) unstable; urgency=low
 

Modified: trunk/libset-scalar-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libset-scalar-perl/debian/copyright?rev=11256&op=diff
==============================================================================
--- trunk/libset-scalar-perl/debian/copyright (original)
+++ trunk/libset-scalar-perl/debian/copyright Mon Dec 17 01:22:30 2007
@@ -2,6 +2,8 @@
 Sat, 16 Jun 2007 15:41:39 -0400.
 
 It was downloaded from http://search.cpan.org/dist/Set-Scalar/
+
+Upstream authors: Jarkko Hietaniemi <jhi at iki.fi>
 
 Files: debian/*
 Copyright: © 2007 Jose Luis Rivas <ghostbar38 at gmail.com>
@@ -10,11 +12,12 @@
 
 Files: *
 Copyright: © 2001-2007 Jarkko Hietaniemi <jhi at iki.fi>
-License: GPL | Artistic
+License: GPL-1+ | Artistic
  This library is free software; you can redistribute it and/or modify it under
  the same terms as Perl itself.
 
-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'.
+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'.