[med-svn] r4338 - trunk/packages/dicomscope/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2009-11-16 17:13:12 +0000 (Mon, 16 Nov 2009)
New Revision: 4338

Modified:
   trunk/packages/dicomscope/trunk/debian/changelog
   trunk/packages/dicomscope/trunk/debian/copyright
   trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides
Log:
Clarify license. Remove trailing changelog about 3.5.1 which will not be uploaded (license issue). Fix lintian/openssl issue

Modified: trunk/packages/dicomscope/trunk/debian/changelog
===================================================================
--- trunk/packages/dicomscope/trunk/debian/changelog	2009-11-16 11:24:34 UTC (rev 4337)
+++ trunk/packages/dicomscope/trunk/debian/changelog	2009-11-16 17:13:12 UTC (rev 4338)
@@ -2,11 +2,4 @@
 
   * Initial release (Closes: #508990)
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 12 Jan 2009 11:12:57 +0100
-
-dicomscope (3.5.1) unstable; urgency=low
-
-  * Initial preparation of the package but no upload
-    to Debian mirror
-
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Fri, 15 Dec 2008 18:28:01 +0100
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Mon, 16 Nov 2009 17:58:43 +0100

Modified: trunk/packages/dicomscope/trunk/debian/copyright
===================================================================
--- trunk/packages/dicomscope/trunk/debian/copyright	2009-11-16 11:24:34 UTC (rev 4337)
+++ trunk/packages/dicomscope/trunk/debian/copyright	2009-11-16 17:13:12 UTC (rev 4338)
@@ -5,14 +5,14 @@
 
 Files: *
 Copyright:
- Copyright (C) 1999, Institute for MicroTherapy
+ Copyright (C) 1999-2009, OFFIS and Institute for MicroTherapy
 License:
  This software and supporting documentation were developed by
 
-   Kuratorium OFFIS e.V.
-   Healthcare Information and Communication Systems
+   OFFIS e.V.
    Escherweg 2
-   D-26121 Oldenburg, Germany
+   26121 Oldenburg
+   Germany
 
  and
 
@@ -20,18 +20,25 @@
    Department of Radiology and MicroTherapy
    Institute for MicroTherapy
    Medical computer science
-
    Universitaetsstrasse 142
-   44799 Bochum, Germany
+   44799 Bochum
+   Germany
 
-   http://www.microtherapy.de/go/cs
-   mailto:computer.science at microtherapy.de
+ THIS SOFTWARE  IS MADE AVAILABLE,  AS IS,  AND OFFIS AND THE INSTITUTE
+ FOR  MICROTHERAPY  MAKE  NO  WARRANTY  REGARDING  THE  SOFTWARE,   ITS
+ PERFORMANCE,  ITS MERCHANTABILITY  OR FITNESS  FOR ANY PARTICULAR USE,
+ FREEDOM FROM  ANY COMPUTER DISEASES  OR ITS CONFORMITY TO ANY SPECIFI-
+ CATION.  THE ENTIRE RISK AS TO QUALITY AND PERFORMANCE OF THE SOFTWARE
+ IS WITH THE USER.
 
- THIS SOFTWARE IS MADE AVAILABLE,  AS IS,  AND THE INSTITUTE MAKES  NO
- WARRANTY REGARDING THE SOFTWARE, ITS PERFORMANCE, ITS MERCHANTABILITY
- OR FITNESS FOR ANY PARTICULAR USE, FREEDOM FROM ANY COMPUTER DISEASES
- OR ITS CONFORMITY TO ANY SPECIFICATION. THE ENTIRE RISK AS TO QUALITY
- AND PERFORMANCE OF THE SOFTWARE IS WITH THE USER.
+ Copyright of the software  and  supporting  documentation  is,  unless
+ otherwise stated,  owned by OFFIS  and the  Institute of MicroTherapy,
+ and free access  is hereby granted  as a license to use this software,
+ copy  this  software  and  prepare  derivative  works  based upon this
+ software.  However,  any distribution  of this software source code or
+ supporting documentation or derivative works (source code and support-
+ ing documentation) must include the three paragraphs of this copyright
+ notice.
 
 Files: debian/*
 Copyright:

Modified: trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides
===================================================================
--- trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides	2009-11-16 11:24:34 UTC (rev 4337)
+++ trunk/packages/dicomscope/trunk/debian/dicomscope.lintian-overrides	2009-11-16 17:13:12 UTC (rev 4338)
@@ -2,3 +2,7 @@
 dicomscope: package-name-doesnt-match-sonames
 # W: dicomscope: shlib-without-versioned-soname usr/lib/libjInterface.so libjInterface.so
 dicomscope: shlib-without-versioned-soname
+# the suspected openssl-gpl conflict is due to
+# the source package being licensed under gpl.
+# therefore, we provide an explicit override
+dicomscope binary: possible-gpl-code-linked-with-openssl