[med-svn] r18096 - trunk/packages/seaview/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-09-22 20:16:02 +0000 (Mon, 22 Sep 2014)
New Revision: 18096

Modified:
   trunk/packages/seaview/trunk/debian/changelog
   trunk/packages/seaview/trunk/debian/copyright
Log:
Fix license according to the PHYLIP license


Modified: trunk/packages/seaview/trunk/debian/changelog
===================================================================
--- trunk/packages/seaview/trunk/debian/changelog	2014-09-22 20:03:25 UTC (rev 18095)
+++ trunk/packages/seaview/trunk/debian/changelog	2014-09-22 20:16:02 UTC (rev 18096)
@@ -1,8 +1,9 @@
-seaview (1:4.5.3-1) UNRELEASED; urgency=medium
+seaview (1:4.5.3-1) unstable; urgency=medium
 
   * New upstream version that can go to main since third party code
     from PHYLIP is now free
   * cme fix dpkg-control
+  * debian/copyright: Third party code from PHYLIP is now BSD-2-Clause
 
  -- Andreas Tille <tille at debian.org>  Mon, 22 Sep 2014 21:59:39 +0200
 

Modified: trunk/packages/seaview/trunk/debian/copyright
===================================================================
--- trunk/packages/seaview/trunk/debian/copyright	2014-09-22 20:03:25 UTC (rev 18095)
+++ trunk/packages/seaview/trunk/debian/copyright	2014-09-22 20:16:02 UTC (rev 18096)
@@ -1,13 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Source: ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_4.5.1.tar.gz
-Disclamer: This package is not part of the Debian operating system.
- The seaview source and binary Debian packages are part of the “non-free” area
- in our archive. The packages in this area are not part of the Debian system,
- although they have been configured for use with Debian. We nevertheless support
- the use of the seaview source and binary Debian packages and provide
- infrastructure for non-free packages (such as our bug tracking system and
- mailing lists). The licences of SeaView do not forbid Debian from using
- autobuilders to create binary packages.
+Upstream-Name: SeaView
+Upstream-Contact: Manolo Gouy <manolo.gouy at univ-lyon1.fr>
+Source: ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
 
 Files: *
 Copyright: 1996-2014 Manolo Gouy <mgouy at biomserv.univ-lyon1.fr>
@@ -70,12 +64,37 @@
  to release a modified version which carries forward this exception.
 
 Files: csrc/dnapars.c csrc/protpars.c
-Copyright: © 1993–2004 University of Washington
-License: PHYLIP
- version 3.6 (c) Copyright 1993-2004 by the University of Washington.
- Written by Joseph Felsenstein, Akiko Fuseki, Sean Lamont, and Andrew Keeffe.
- Permission is granted to copy and use this program provided no fee is
- charged for it and provided that this copyright notice is not removed.
+Copyright: © 1993–2014 University of Washington
+License: BSD-2-Clause
+ derived from PHYLIP version 3.696 with the following copyright:
+ .
+   version 3.696.
+   Written by Joseph Felsenstein, Akiko Fuseki, Sean Lamont, and Andrew Keeffe.
+ .
+   Copyright (c) 1993-2014, Joseph Felsenstein
+   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.
+ .
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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: debian/*
 Copyright: © 1999 Stephane Bortzmeyer <bortzmeyer at debian.org>