[med-svn] r20548 - trunk/packages/tree-puzzle/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-11-25 12:56:16 +0000 (Wed, 25 Nov 2015)
New Revision: 20548

Modified:
   trunk/packages/tree-puzzle/trunk/debian/changelog
   trunk/packages/tree-puzzle/trunk/debian/copyright
Log:
DEP5


Modified: trunk/packages/tree-puzzle/trunk/debian/changelog
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/changelog	2015-11-25 12:43:51 UTC (rev 20547)
+++ trunk/packages/tree-puzzle/trunk/debian/changelog	2015-11-25 12:56:16 UTC (rev 20548)
@@ -7,6 +7,7 @@
   * Use dh_autoreconf to update for new architectures
     Closes: #765262
   * Try hard to run the test suite
+  * DEP5 copyright
 
  -- Andreas Tille <tille at debian.org>  Wed, 25 Nov 2015 13:25:30 +0100
 

Modified: trunk/packages/tree-puzzle/trunk/debian/copyright
===================================================================
--- trunk/packages/tree-puzzle/trunk/debian/copyright	2015-11-25 12:43:51 UTC (rev 20547)
+++ trunk/packages/tree-puzzle/trunk/debian/copyright	2015-11-25 12:56:16 UTC (rev 20548)
@@ -1,54 +1,29 @@
-This package was debianized by  -- Andreas Tille <tille at debian.org> on
-Mon,  5 Nov 2001 11:00:04 +0100
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: TREE-PUZZLE
+Upstream-Contact: Heiko A. Schmidt <heiko.schmidt at univie.ac.at>
+Source: http://www.tree-puzzle.de
 
-It was downloaded from http://www.tree-puzzle.de
+Files: *
+Copyright: 1995-1999 Korbinian Strimmer <korbinian.strimmer at zoo.ox.ac.uk>
+                     and Arndt von Haeseler <haeseler at eva.mpg.de>
+           1999-2003 Heiko A. Schmidt, Korbinian Strimmer, Martin Vingron, and Arndt von Haeseler
+           2003-2015 Heiko A. Schmidt, Korbinian Strimmer, and Arndt von Haeseler
+License: GPL-2+
 
-Upstream Authors: Korbinian Strimmer <korbinian.strimmer at zoo.ox.ac.uk> 
-   and Arndt von Haeseler <haeseler at eva.mpg.de>.   
+Files: debian/*
+Copyright: 2001-2015 Andreas Tille <tille at debian.org>
+License: GPL-2+
 
-Copyright 1995-1999 by Korbinian Strimmer and Arndt von Haeseler
-Copyright 1999-2003 by Heiko A. Schmidt, Korbinian Strimmer, Martin Vingron, and Arndt von Haeseler
-Copyright 2003-2004 by Heiko A. Schmidt, Korbinian Strimmer, and Arndt von Haeseler
-
-License:
-  You are free to distribute this software under the terms of
-  the GNU General Public Licence.
-  On Debian systems, the complete text of the GNU General Public
-  Licence can be found in /usr/share/common-licenses/GPL file.
-
-
-A small warning: some files are derived from a work (the book "Numerical 
-recipes") for which the authors do not hold the copyright. It does not 
-harm:
-
-Date: Mon, 17 May 1999 13:08:31 +0200 (MET DST)
-From: Korbinian Strimmer <strimmer at biochem.mpg.de>
-To: Stephane Bortzmeyer <bortzmeyer at pasteur.fr>
-Cc: Arndt von Haeseler <haeseler at eva.mpg.de>
-Subject: License
-
-[...]
-
-However:
-
-> >The whole package
-> >   is licenced under the GNU public licence, except for the parts
-> >   indicated in the sources where the copyright of the authors does not
-> >   apply.
->
-> Grepping through the source code, I find no place where there is a
-> copyright other than yours. Do you have the name of the other authors
-> so we can reach them and try to see if they agree with a GPL
-> distribution?
-
-This means that parts of the sources originally derive from
-Numerical Recipes (indicated in the sources).  However, I think
-that the code is suffiently modified as not be be generic
-NR code.  In addition, we are not making money with the program,
-so probably the whole source can be considered GPL.  On the
-other hand, I have not asked NR and I am not a lawyer.  For that
-reason the GPL licence covers only part of the sources.
-
-
- Korbinian
-
+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.
+ .
+    This program 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.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ Licence can be found in /usr/share/common-licenses/GPL-2 file.