[med-svn] r10826 - trunk/packages/elastix/trunk/debian

Fri May 11 12:48:52 UTC 2012

Author: tille
Date: 2012-05-11 12:48:51 +0000 (Fri, 11 May 2012)
New Revision: 10826

Modified:
   trunk/packages/elastix/trunk/debian/changelog
   trunk/packages/elastix/trunk/debian/copyright
Log:
DEP5


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

--- trunk/packages/elastix/trunk/debian/changelog	2012-05-11 12:39:32 UTC (rev 10825)
+++ trunk/packages/elastix/trunk/debian/changelog	2012-05-11 12:48:51 UTC (rev 10826)
@@ -9,9 +9,8 @@
      - Tasks file had a slightly more precise information about author
      - Valid BibTeX authors field
      - More precise information (authors, pmid, doi)
-  TODO: Please convert debian/copyright to DEP5, the command
+  * debian/copyright: Rewritten to match DEP5. verified using
      cme fix dpkg-copyright
-  helps a lot
 
  -- Andreas Tille <tille at debian.org>  Fri, 11 May 2012 13:50:29 +0200
 

Modified: trunk/packages/elastix/trunk/debian/copyright
===================================================================
--- trunk/packages/elastix/trunk/debian/copyright	2012-05-11 12:39:32 UTC (rev 10825)
+++ trunk/packages/elastix/trunk/debian/copyright	2012-05-11 12:48:51 UTC (rev 10826)
@@ -1,62 +1,64 @@
-Name: elastix
-Maintainer: Stefan Klein and Marius Staring
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: elastix
 Source: http://elastix.isi.uu.nl/
+Upstream-Contacte: Stefan Klein and Marius Staring
 
+Files: *
+Copyright: 2004-2011 University Medical Center Utrecht, All rights reserved.
+ Elastix Copyright Notice:
+ .
+ Elastix was initially developed by Stefan Klein and Marius Staring
+ under contract to the Image Sciences Institute, University Medical
+ Center Utrecht, The Netherlands.
+License: BSD-simplified
 
-Elastix Copyright Notice:
+Files: Common/KNN/ann_1.1/*
+Copyright: 1997-2005 University of Maryland and Sunil Arya and David Mount
+License: LGPL-2.1
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser Public License as published by the
+ Free Software Foundation; either version 2.1 of the License, or (at your
+ option) any later version.
+ .
+ On Debian systems this license may be found in file
+ /usr/share/common-licenses/LGPL-2.1.  
+Comment: In the Debian package of elastix, ANN is statically linked.  Clause 3
+ of the LGPL is hereby invoked to re-license ANN under the GNU Public
+ License, v2 (see /usr/share/common-licenses/GPL-2).  The elastix
+ package as a whole is therefore under the GPL v2 license.
 
-      Copyright (c) 2004-2010 University Medical Center Utrecht
-      All rights reserved.
+Files: debian/*
+Copyright: 2010-2011 Steve M. Robbins <smr at debian.org>
+           2012 Andreas Tille <tille at debian.org>
+License: BSD-simplified
 
-
-Elastix was initially developed by Stefan Klein and Marius Staring
-under contract to the Image Sciences Institute, University Medical
-Center Utrecht, The Netherlands.
-
-
-Elastix is distributed under the new and simplified BSD license
-approved by the Open Source Initiative (OSI)
-[http://www.opensource.org/licenses/bsd-license.php]:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
+License: BSD-simplified
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
     * Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
-
+ .
     * 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.
-
+ .
     * Neither the name of the University Medical Center Utrecht 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 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 OWNER 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.
+Comment: The software is partially derived from the Insight Segmentation and
+ Registration Toolkit (ITK), which is also distributed under the new
+ and simplified BSD licence.  The ITK is required by Elastix for
+ compilation of the source code.
 
-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 OWNER 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.
-
-
-The software is partially derived from the Insight Segmentation and
-Registration Toolkit (ITK), which is also distributed under the new
-and simplified BSD licence.  The ITK is required by Elastix for
-compilation of the source code.
-
-The copyright of the files in the Common/KNN/ann_1.1 subdirectory is
-held by a third party, the University of Maryland. The ANN package is
-distributed under the GNU Lesser Public Licence v2.1.  This license
-may be found in file /usr/share/common-licenses/LGPL-2.1.  
-
-
-In the Debian package of elastix, ANN is statically linked.  Clause 3
-of the LGPL is hereby invoked to re-license ANN under the GNU Public
-License, v2 (see /usr/share/common-licenses/GPL-2).  The elastix
-package as a whole is therefore under the GPL v2 license.
-


