[med-svn] [plink1.9] 01/04: Refresh d/*, improve d/copyright

[Dylan Aïssi]

This is an automated email from the git hooks/post-receive script.

bob.dybian-guest pushed a commit to branch master
in repository plink1.9.

commit 95014b8c6a8202cc1d4062336f3aa246c856d4bc
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date:   Thu Jan 29 07:03:00 2015 +0100

    Refresh d/*, improve d/copyright
---
 debian/README.source |  6 ------
 debian/TODO.Debian   |  3 +--
 debian/copyright     | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 3584546..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,6 +0,0 @@
-Upstream source patching
-------------------------
-
-This packages uses the program ‘quilt’ to apply patch from the ‘debian/patches’
-directory. You can find instructions on how to use quilt in the following file:
-‘/usr/share/doc/quilt/README.source’.
diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 2067f06..c35462c 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,2 +1 @@
--Change debian/* license from GPL2 to GPL3 to be consistent with upstream license ???
--Update metadata with the new paper about plink2 when it will be available in a journal
+- Update plink1.9 license to GPL-3+ from GPL-3 when upstream relicensing
diff --git a/debian/copyright b/debian/copyright
index d7953a8..2548968 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,7 +12,48 @@ Files: pigz.c
 Copyright: 2007-2013 Mark Adler, Christopher Chang
 License: Zlib
 
-Files: Rconnection.cc
+Files: plink.c
+Copyright: 2005-2015 Shaun Purcell, Christopher Chang
+License: GPL-3+
+Comment:
+  -----------------
+  Date: Tue, 3 Feb 2015 19:11:58 +0100
+  From: Dylan <bob.dybian at gmail.com>
+  To: <chrchang at alumni.caltech.edu>
+  .
+  Dear Christopher Chang,
+  As you already know, I making a package of plink 1.9 for Debian Med. I have
+  a question about license of plink 1.9. Plink 1.9 is licensed under GPL-3,
+  but the header of the "plink.c" file says that the software is released
+  under GPL-3+ ("or any later version"). Could you please confirm me that it
+  is a mistake and the license is only GPL-3 and not GPL-3+ ?
+  .
+  Best regards,
+  Dylan
+  -----------------
+  Date: Tue, 3 Feb 2015 10:16:16 -0800
+  From: Chris Chang <chrchang at alumni.caltech.edu>
+  To: Dylan <bob.dybian at gmail.com>
+  .
+  Hi Dylan,
+  .
+  I actually intended to allow any later version.  I will modify the other
+  files to reflect this.
+  .
+  --Chris
+  -----------------
+
+Files: plink_glm.c
+Copyright: 2012-2015 Christopher Chang,
+           2009-2014 Shigeo Mitsunari <herumi at nifty.com>
+License: GPL-3 and BSD-3-Clause
+
+Files: plink_ld.c
+Copyright: 2012-2015 Christopher Chang,
+           2012-2014 Richard Howey <richard.howey at ncl.ac.uk> (CASSI software)
+License: GPL-3
+
+Files: Rconnection.*
 Copyright: 2004-8 Simon Urbanek
 License: LGPL-2.1
 
@@ -55,6 +96,24 @@ License: GPL-3
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-3'.
 
+License: GPL-3+
+ This package 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 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
 License: Zlib
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/plink1.9.git