[med-svn] r22468 - in trunk/packages/insighttoolkit/trunk/debian: . patches
Gert Wollny
gert-guest at moszumanska.debian.org
Sat Jul 9 12:13:54 UTC 2016
Author: gert-guest
Date: 2016-07-09 12:13:53 +0000 (Sat, 09 Jul 2016)
New Revision: 22468
Modified:
trunk/packages/insighttoolkit/trunk/debian/copyright
trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch
trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch
trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch
trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch
Log:
more d/copyright updates and patch documentation
Modified: trunk/packages/insighttoolkit/trunk/debian/copyright
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/copyright 2016-07-09 10:55:53 UTC (rev 22467)
+++ trunk/packages/insighttoolkit/trunk/debian/copyright 2016-07-09 12:13:53 UTC (rev 22468)
@@ -14,8 +14,8 @@
Modules/ThirdParty/ZLIB/src/itkzlib
Modules/ThirdParty/VNL/src/vxl/core/vnl/algo/amoeba_algorithm.pdf
Documentation
+ Testing/Data/Input/DCB120604.t61/11/pulseprogram
-
Debian ITK is Licensed under the GPL
------------------------------------
@@ -37,8 +37,11 @@
Files: *
Copyright: Copyright 1999-2011 Insight Software Consortium
License: Apache 2.0
- A copy of the Apache 2.0 license can be found in /usr/share/common-licenses/Apache-2.0
+Files: debian/*
+Copyright: Copyright 2007-2016 Debian-med team
+License: Apache 2.0
+
Files: Modules/ThirdParty/DICOMParser/src/DICOMParser/*
Copyright: Copyright (c) 2003 Matt Turek
License: BSD-4-clause-DICOMParser
@@ -70,9 +73,6 @@
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: Copyright 2007-2016 Debian-med team
-License: Apache 2.0
Files: Modules/ThirdParty/GIFTI/src/gifticlib/*
Authors: Richard Reynolds, SSCC, DIRP, NIMH, National Institutes of Health
@@ -81,14 +81,14 @@
encouraged to incorporate the library into their application, and to
contribute changes or enhancements to gifticlib.
+Files: Modules/ThirdParty/KWIML/src/itkkwiml/*
+Copyright: Copyright 2010-2015 Kitware, Inc.
+License: BSD-3-clause-Kitware
+
Files: Modules/ThirdParty/KWSys/src/KWSys/*
Copyright: Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
License: BSD-3-clause-Kitware
-Files: Modules/ThirdParty/KWIML/src/itkkwiml/*
-Copyright: Copyright 2010-2015 Kitware, Inc.
-License: BSD-3-clause-Kitware
-
Files: Modules/ThirdParty/MetaIO/src/MetaIO/*
Copyright: Copyright 2000-2014 Insight Software Consortium
License: BSD-3-clause-MetaIO
@@ -149,6 +149,10 @@
.
3. This notice may not be removed or altered from any source distribution.
+Files: Modules/ThirdParty/NrrdIO/CMake/*
+Copyright: Copyright Insight Software Consortium
+License: Apache 2.0
+
Files: Modules/ThirdParty/OpenJPEG/src/openjpeg/*
Copyright: Copyright (c) 2002-2012, Communications and Remote Sensing Laboratory,
Universite catholique de Louvain (UCL), Belgium
@@ -182,7 +186,7 @@
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
-Files: Modules/ThirdParty/VNL/*
+Files: Modules/ThirdParty/VNL/src/vxl/*
Copyright: Copyright 2000-2013 VXL Contributors
License: BSD-3-clause-VXL
Redistribution and use in source and binary forms, with or without
@@ -251,34 +255,62 @@
customer, and you are instead telling them how they can obtain it for
free, then you are not required to make any arrangement with me.)
+Files: Modules/ThirdParty/VNL/src/vxl/vcl/internal/vcl_atomic_count_gcc.h
+Copyright:
+ Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
+ Copyright (c) 2002 Lars Gullik Bjonnes <larsbj at lyx.org>
+ Copyright 2003-2005 Peter Dimov
+License: BSL-1.0
+
+Files:
+ Modules/ThirdParty/VNL/src/vxl/vcl/internal/vcl_atomic_count_pthreads.h
+ Modules/ThirdParty/VNL/src/vxl/vcl/internal/vcl_atomic_count_gcc_x86.h
+Copyright: Copyright 2007 Peter Dimov
+License: BSL-1.0
+
+Files: Modules/ThirdParty/VNL/src/vxl/vcl/internal/vcl_atomic_count_sync.h
+Copyright: Copyright (c) 2001, 2002 Peter Dimov and Multi Media Ltd.
+License: BSL-1.0
+
+Files: Modules/ThirdParty/VNL/src/vxl/vcl/internal/vcl_interlocked.h
+Copyright: Copyright 2005 Peter Dimov
+License: BSL-1.0
+
+Files: Modules/ThirdParty/VNL/src/vxl/vcl/internal/vcl_atomic_count_solaris.h
+Copyright:
+ Copyright (c) 2001-2005 Peter Dimov
+ Copyright (c) 2006 Michael van der Westhuizen
+License: BSL-1.0
+
+Files: Modules/ThirdParty/VNL/src/vxl/vcl/internal/vcl_atomic_count_win32.h
+Copyright: Copyright (c) 2001-2005 Peter Dimov
+License: BSL-1.0
+
Files: Modules/ThirdParty/pygccxml/*
Copyright:
Copyright 2014-2015 Insight Software Consortium
Copyright 2004-2008 Roman Yakovenko
-License: Boost Software License 1.0
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
+License: BSL-1.0
+Files: Modules/IO/ImageBase/include/itkfdstream/fdstream.hpp
+Copyright: (C) Copyright Nicolai M. Josuttis 2001.
+License: fdstream
+ Permission to copy, use, modify, sell and distribute this software
+ is granted provided this copyright notice appears in all copies.
+ This software is provided "as is" without express or implied
+ warranty, and with no claim as to its suitability for any purpose.
+Files:
+ Modules/Core/ImageFunction/include/itkGaussianInterpolateImageFunction.h
+ Modules/Core/ImageFunction/include/itkGaussianInterpolateImageFunction.hxx
+Copyright:
+ Copyright (c) Insight Software Consortium
+ Copyright (c) 1993-2015 Ken Martin, Will Schroeder, Bill Lorensen
+License: Apache 2.0 + VTK-Copyright
+
+License: Apache 2.0
+ A copy of the Apache 2.0 license can be found in /usr/share/common-licenses/Apache-2.0
+
License: BSD-3-clause-Kitware
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -308,3 +340,53 @@
(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: BSL-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
+License: VTK-Copyright
+ 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 name of Ken Martin, Will Schroeder, or Bill Lorensen nor the names
+ of any 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 AUTHORS 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.
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch 2016-07-09 10:55:53 UTC (rev 22467)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/atomic_load.patch 2016-07-09 12:13:53 UTC (rev 22468)
@@ -1,7 +1,7 @@
Description: Make the Load operation truly atomic
Author: Gert Wollny <gw.fossdev at gmail.com>
-Forwarded: yes
-Last-Update: 2016-02-21
+Forwarded: https://issues.itk.org/jira/browse/ITK-3413
+Last-Update: 2016-07-09
Index: b/Modules/Core/Common/include/itkAtomicIntDetail.h
===================================================================
@@ -17,3 +17,4 @@
}
static void Store(ValueType *ref, ValueType val)
+
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch 2016-07-09 10:55:53 UTC (rev 22467)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/flatStructuringElementTest_fix_rescale.patch 2016-07-09 12:13:53 UTC (rev 22468)
@@ -3,9 +3,9 @@
image, but this filter is numerically unstable for this
operation.
Author: Gert Wollny <gw.fossdev at gmail.com>
-Forwarded: yes
+Forwarded: https://issues.itk.org/jira/browse/ITK-3413
Bug: https://bugs.debian.org/814591
-Last-Update: 2016-02-21
+Last-Update: 2016-07-09
Index: b/Modules/Filtering/MathematicalMorphology/test/itkFlatStructuringElementTest2.cxx
===================================================================
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch 2016-07-09 10:55:53 UTC (rev 22467)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch 2016-07-09 12:13:53 UTC (rev 22468)
@@ -1,3 +1,8 @@
+Description: Correct inclusion order to adhere to stricter parsing rules
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Bug: https://issues.itk.org/jira/browse/ITK-3451
+Forwarded: http://review.source.kitware.com/#/c/21313/
+
--- insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/Core/Common/include/itkMathDetail.h 2016-05-26 17:32:22.000000000 +0200
+++ insighttoolkit4-4.10.0/Modules/Core/Common/include/itkMathDetail.h 2016-07-06 15:58:30.820967520 +0200
@@ -28,7 +28,7 @@
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch 2016-07-09 10:55:53 UTC (rev 22467)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch 2016-07-09 12:13:53 UTC (rev 22468)
@@ -1,3 +1,8 @@
+Description: Use system NIFTI library
+Author: Gert Wollny
+Forwarded: No
+Last-Updated: 2016-07-09
+
diff -ru insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt insighttoolkit4-4.10.0/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt
--- insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt 2016-05-26 17:32:22.000000000 +0200
+++ insighttoolkit4-4.10.0/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt 2016-07-06 16:10:33.255144401 +0200
More information about the debian-med-commit
mailing list