[SCM] Perl extension for running and parsing NCBIs BLAST 2.x branch, master, updated. debian/0.66-1-15-ge8ed3af

[Laszlo Kajan]

The following commit has been merged in the master branch:
commit e8ed3afd0d6c838fd99d1a717f4273a1a3de4ed6
Author: Laszlo Kajan <lkajan at rostlab.org>
Date:   Wed Jul 11 15:31:44 2012 +0200

    changed debian/* license to 'like Perl' (Artistic or GPL-1+)

diff --git a/debian/changelog b/debian/changelog
index e87b683..8b6c3dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,9 @@
 libnhgri-blastall-perl (0.66-1) UNRELEASED; urgency=low
 
-  TODO:
-  - d/copyright:
-    + "GPL" for the packaging is not really elegant, since there are 3
-      versions of GPL (with and without "later version"). I suggest to actually
-      pick a specific one
-    + the formatting for the GPL license stanza is a bit unusual
-      and the copyright part in their contradicts the statement 2 lines earlier
-
   * Initial release (Closes: 680177).
 
+  [Laszlo Kajan <lkajan at rostlab.org>]
+  * Changed debian/* license to 'like Perl' (Artistic or GPL-1+)
+
  -- Laszlo Kajan <lkajan at rostlab.org>  Tue, 10 Jul 2012 16:53:42 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 254fea7..ece8688 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Joseph Ryan <jfryan at nhgri.nih.gov>
 Source: ftp://ftp.nhgri.nih.gov/pub/software/blastall/NHGRI-Blastall-0.66.tar.gz
 
+Files: debian/*
+Copyright: 2009 Laszlo Kajan <lkajan at rostlab.org>
+	   2012 Jens Preußner <jenzo at cbv.net>
+License: Artistic or GPL-1+
+
 Files: *
 Copyright: public-domain
 License: public-domain
@@ -23,9 +28,18 @@ License: public-domain
     of the authors as the source of the software or data should be made, 
     using http://genome.nhgri.nih.gov/webblast as the citation. 
 
-Files: debian/*
-Copyright: 2009, Laszlo Kajan <lkajan at rostlab.org>
-	   2012, Jens Preußner <jenzo at cbv.net>
-License: GPL
-    The Debian packaging is (C) Copyright 2009, Laszlo Kajan <lkajan at rostlab.org> and
-    is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+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 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 systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.

-- 
Perl extension for running and parsing NCBIs BLAST 2.x