[med-svn] r8534 - trunk/packages/arb/trunk/debian

Fri Nov 11 13:59:52 UTC 2011

Author: tille
Date: 2011-11-11 13:59:52 +0000 (Fri, 11 Nov 2011)
New Revision: 8534

Modified:
   trunk/packages/arb/trunk/debian/changelog
   trunk/packages/arb/trunk/debian/copyright
Log:
More DEP5 fixes.  Package builds but arb-doc package broken - needs checking how the docs are builded in new version.


Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================

--- trunk/packages/arb/trunk/debian/changelog	2011-11-11 13:30:24 UTC (rev 8533)
+++ trunk/packages/arb/trunk/debian/changelog	2011-11-11 13:59:52 UTC (rev 8534)
@@ -13,6 +13,7 @@
     - Standards-Version: 3.9.2 (no changes needed)
     - Fixed Vcs fields
   * Debhelper 8 (control+compat)
+  * debian/copyright: several DEP5 fixes
 
  -- Andreas Tille <tille at debian.org>  Fri, 11 Nov 2011 11:46:22 +0100
 

Modified: trunk/packages/arb/trunk/debian/copyright
===================================================================
--- trunk/packages/arb/trunk/debian/copyright	2011-11-11 13:30:24 UTC (rev 8533)
+++ trunk/packages/arb/trunk/debian/copyright	2011-11-11 13:59:52 UTC (rev 8534)
@@ -6,12 +6,6 @@
 Packaged-By: Andreas Tille <tille at debian.org>
 Packaged-Date: Thu, 03 Jun 2004 11:17:55 +0200
 
-Files: debian/*
-Copyright: (C) 2008 Andreas Tille <tille at debian.org>
-License: GPL
-X-Comment: On Debian systems, the complete text of the GNU Public
- License can be found in `/usr/share/common-licenses/GPL-2'.
-
 Files: *
 License: ARB copyright and license information
   * The ARB software and documentation are not in the public domain.
@@ -67,7 +61,7 @@
  .
  9. July 2008
  Ralf Westram <westram at arb-home.de>
-Copyright: (C) 1994-2008
+Copyright: 1994-2011
  Department of Microbiology:
   - Dr. Wolfgang Ludwig (Biologist) <ludwig at arb-home.de>
     Task: Group Leader; Inventor of ARB, knows everything about it
@@ -86,9 +80,8 @@
   - Gangolf Jobb (Biologist) <jobb at arb-home.de>
     Task:  Development and integration of alignment- and tree-generation-software
 
-X-Comment: Copyright notices for programs distributes together with ARB
-
 Files: GDE/*
+Copyright: 2004-2008 The Board of Trustees of the University of Illinois and by Steven Smith
 License:
   * The Genetic Data Environment (GDE) software and documentation are not in the
     public domain. Portions of this code are owned and copyrighted by the
@@ -106,13 +99,12 @@
     by the GDE are copyrighted by, and are the property of their respective
     authors unless otherwise stated.
 
-
 Files: GDE/PHYLIP/*
 Copyright: (c) Copyright 1986-1993 by Joseph Felsenstein and the University
   of Washington.
 License: Permission is granted to copy this document provided that
   no fee is charged for it and that this copyright notice is not removed.
-X-Comment: Remark from the Debian package maintainer Andreas Tille
+Comment: Remark from the Debian package maintainer Andreas Tille
  Phylp is not used in the binary package because the Debian
  package is used which is in the non-free part of Debian.
  Remark: After heavy discussion with the author of Phylip it
@@ -122,7 +114,7 @@
 Copyright: (C) 1991   Xiaoqiu Huang
 License: The distribution of the program is granted provided no charge
  is made and the copyright notice is included.
-X-Comment: Remark from the Debian package maintainer Andreas Tille
+Comment: Remark from the Debian package maintainer Andreas Tille
  I was unable to find a source URL where this program which is
  claimed as external can be downloaded.
 
@@ -135,7 +127,7 @@
  .
  This paragraph was just added to the copyright file to mention that
  there is some copyrighted work which was not mentioned above.
-X-Comment: convert_aln --  an alignment(or sequence) converter written
+Comment: convert_aln --  an alignment(or sequence) converter written
  by Wen-Min Kuan for the Ribsomal Database Project(RDP), April 28, 1992.
  .
  Remark from the Debian package maintainer Andreas Tille:
@@ -146,16 +138,17 @@
 Copyright: (C) 1998, 1999, 2000 by Gary J. Olsen,
  1986 - 1990 by the University of Washington and Joseph Felsenstein.
 License: GPL
-X-Comment: On Debian systems, the complete text of the GNU Public
+ On Debian systems, the complete text of the GNU Public
  License can be found in `/usr/share/common-licenses/GPL-2'.
- .
- Remark from the Debian package maintainer Andreas Tille:
+Commet: Remark from the Debian package maintainer Andreas Tille:
  This is not used in the binary package because it is available as
  official Debian package and has a free license (see this package).
 
 Files: GDE/RAxML/[a]*
 Copyright: (C) 2004-2008 Alexandros Stamatakis, Michael Ott, Thomas Ludwig
 License: GPL
+ On Debian systems, the complete text of the GNU Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.
 Comment: There is also a file GDE/RAxML/softwaredisclaimer in this directory
  which contains some license text which might be provided in a private
  mail or whatever from the RAxML authors to the Arb authors.  The relevance
@@ -176,13 +169,39 @@
 Copyright: (C) 1987, 1993, 1994
  The Regents of the University of California.  All rights reserved.
 License: BSD
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
 
 Files: GDE/TREEPUZZLE/*
 Copyright: (C) 1995-1999 Korbinian Strimmer and Arndt von Haeseler
  (C) 1999-2001 Heiko A. Schmidt, Korbinian Strimmer,Martin Vingron,
            Arndt von Haeseler
 License: GPL
-X-Comment: On Debian systems, the complete text of the GNU Public
+ On Debian systems, the complete text of the GNU Public
  License can be found in `/usr/share/common-licenses/GPL-2'.
  .
  This code is not used in the binary package because it is available as
@@ -191,15 +210,13 @@
 Files: READSEQ/*
 Copyright: 1990-1993 D. Gilbert <gilbertd at bio.indiana.edu>
 License: Public Domain
-X-Comment: This code is not used in the binary package because it is
+ readseq is public domain software
+Comment: This code is not used in the binary package because it is
  available as official Debian package and has a free license (see this
  package).
 
-Files: GDE/MOLPHY/*
-Copyright: (c) 1992-1996, Jun Adachi & Masami Hasegawa
-License: MOLPHY is a free software, and you can use and redistribute it.
-X-Comment: I wrote an e-mail to the authors if they could fix this license
- because it conflicts with DFSG #3 (Derived works) but I got no response yet.
- .
- This code is also not used in the binary package because the Debian
- package is used which is in the non-free part of Debian.
+Files: debian/*
+Copyright: (C) 2008-2011 Andreas Tille <tille at debian.org>
+License: GPL
+ On Debian systems, the complete text of the GNU Public
+ License can be found in `/usr/share/common-licenses/GPL-2'.


