[med-svn] r16754 - trunk/packages/staden/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-04-23 10:04:09 +0000 (Wed, 23 Apr 2014)
New Revision: 16754

Modified:
   trunk/packages/staden/trunk/debian/changelog
   trunk/packages/staden/trunk/debian/copyright
Log:
Clarify license terms of some parts of the code an notice that there is some remaining non-free part


Modified: trunk/packages/staden/trunk/debian/changelog
===================================================================
--- trunk/packages/staden/trunk/debian/changelog	2014-04-22 15:07:24 UTC (rev 16753)
+++ trunk/packages/staden/trunk/debian/changelog	2014-04-23 10:04:09 UTC (rev 16754)
@@ -17,8 +17,13 @@
      Hint: spin_emboss/create_emboss_files.tcl:
              set acd [file dirname $dir]/../share/EMBOSS/acd
            I somehow suspect that /share/EMBOSS needs to be dropped
+   * non-free???
+     Files: tracediff/*
+     Copyright: 2001 Medical Research Council
+     License: non-free_without_fee
 
 
+
   [ Tim Booth ]
   * Initial release to Debian (Closes: #710324)
 

Modified: trunk/packages/staden/trunk/debian/copyright
===================================================================
--- trunk/packages/staden/trunk/debian/copyright	2014-04-22 15:07:24 UTC (rev 16753)
+++ trunk/packages/staden/trunk/debian/copyright	2014-04-23 10:04:09 UTC (rev 16754)
@@ -62,18 +62,16 @@
 Copyright: 1993 The Regents of the University of California.
            1994-1997 Sun Microsystems, Inc.
            1998-1999 by Scriptics Corporation.
-License: FIXME: seek sources.debian.net for the file "license.terms"
+License: UC_SUN_Scriptics
 
 Files: tk_utils/tk_defs.h
 Copyright: 1991-1994 The Regents of the University of California.
            1994-1995 Sun Microsystems, Inc
-License: FIXME: seek sources.debian.net for the file "license.terms"
- See the file "license.terms" for information on usage and redistribution
- of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+License: UC_SUN_Scriptics
 
 Files: tracediff/*
 Copyright: 2001 Medical Research Council
-License: FIXME: non-free_without_fee
+License: non-free_without_fee
  Permission to use, copy, modify and distribute this software and its
  documentation for any purpose is hereby granted without fee, provided that
  this copyright and notice appears in all copies.
@@ -115,3 +113,44 @@
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: UC_SUN_Scriptics
+ This software is copyrighted by the Regents of the University of
+ California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+ Corporation and other parties.  The following terms apply to all files
+ associated with the software unless explicitly disclaimed in
+ individual files.
+ .
+ The authors hereby grant permission to use, copy, modify, distribute,
+ and license this software and its documentation for any purpose, provided
+ that existing copyright notices are retained in all copies and that this
+ notice is included verbatim in any distributions. No written agreement,
+ license, or royalty fee is required for any of the authorized uses.
+ Modifications to this software may be copyrighted by their authors
+ and need not follow the licensing terms described here, provided that
+ the new terms are clearly indicated on the first page of each file where
+ they apply.
+ .
+ IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+ FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+ DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+ .
+ THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
+ IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+ NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+ MODIFICATIONS.
+ .
+ GOVERNMENT USE: If you are acquiring this software on behalf of the
+ U.S. government, the Government shall have only "Restricted Rights"
+ in the software and related documentation as defined in the Federal 
+ Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+ are acquiring the software on behalf of the Department of Defense, the
+ software shall be classified as "Commercial Computer Software" and the
+ Government shall have only "Restricted Rights" as defined in Clause
+ 252.227-7013 (b) (3) of DFARs.  Notwithstanding the foregoing, the
+ authors grant the U.S. Government and others acting in its behalf
+ permission to use and distribute the software in accordance with the
+ terms specified in this license.