[med-svn] [Git][med-team/insighttoolkit][master] 5 commits: Remove superfluous entries.
Steven Robbins (@smr)
gitlab at salsa.debian.org
Sun Oct 31 21:51:54 GMT 2021
Steven Robbins pushed to branch master at Debian Med / insighttoolkit
Commits:
5da74ccd by Steve Robbins at 2021-10-25T22:47:09-05:00
Remove superfluous entries.
- - - - -
8271c90d by Steve Robbins at 2021-10-31T14:47:47-05:00
Override lintian warning about missing manual page
- - - - -
82927da6 by Steve Robbins at 2021-10-31T14:56:56-05:00
Document creation of source tarball.
- - - - -
380dac8f by Steve Robbins at 2021-10-31T16:40:57-05:00
Update conflicts/replaces
- - - - -
3219a3eb by Steve Robbins at 2021-10-31T16:51:25-05:00
Add override for static lib.
- - - - -
4 changed files:
- debian/control
- debian/control.in
- debian/copyright
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -50,8 +50,8 @@ Section: libdevel
Architecture: amd64 i386
Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit5.2 (= ${binary:Version}), libgdcm-dev, libdcmtk-dev, libhdf5-dev, libdouble-conversion-dev, libexpat-dev, libnifti-dev, libminc-dev
Recommends: libfftw3-dev, uuid-dev
-Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev
-Replaces: libinsighttoolkit-dev
+Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev, libinsighttoolkit4-dev
+Replaces: libinsighttoolkit-dev, libinsighttoolkit3-dev, libinsighttoolkit4-dev
Suggests: insighttoolkit5-examples
Description: Image processing toolkit for registration and segmentation - development
ITK is an open-source software toolkit for performing registration and
@@ -72,8 +72,6 @@ Section: devel
Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libinsighttoolkit5-dev
-Conflicts: insighttoolkit-examples
-Replaces: insighttoolkit-examples
Description: Image processing toolkit for registration and segmentation - examples
ITK is an open-source software toolkit for performing registration and
segmentation. Segmentation is the process of identifying and
=====================================
debian/control.in
=====================================
@@ -50,8 +50,8 @@ Section: libdevel
Architecture: amd64 i386
Depends: ${shlibs:Depends}, ${misc:Depends}, libinsighttoolkit at SOVERSION@ (= ${binary:Version}), libgdcm-dev, libdcmtk-dev, libhdf5-dev, libdouble-conversion-dev, libexpat-dev, libnifti-dev, libminc-dev
Recommends: libfftw3-dev, uuid-dev
-Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev
-Replaces: libinsighttoolkit-dev
+Conflicts: libinsighttoolkit-dev, libinsighttoolkit3-dev, libinsighttoolkit4-dev
+Replaces: libinsighttoolkit-dev, libinsighttoolkit3-dev, libinsighttoolkit4-dev
Suggests: insighttoolkit at VER_MAJOR@-examples
Description: Image processing toolkit for registration and segmentation - development
ITK is an open-source software toolkit for performing registration and
@@ -72,8 +72,6 @@ Section: devel
Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libinsighttoolkit at VER_MAJOR@-dev
-Conflicts: insighttoolkit-examples
-Replaces: insighttoolkit-examples
Description: Image processing toolkit for registration and segmentation - examples
ITK is an open-source software toolkit for performing registration and
segmentation. Segmentation is the process of identifying and
=====================================
debian/copyright
=====================================
@@ -215,27 +215,6 @@ License: netlib-blas
is done, however, it is the responsibility of the person who modified the routine
to provide support. (http://www.netlib.org/blas/)
-Files: Modules/ThirdParty/VNL/src/vxl/v3p/netlib/triangle.*
-Copyright:
- Copyright 1993, 1995, 1997, 1998, 2002, 2005
- Jonathan Richard Shewchuk, 2360 Woolsey #H
- Berkeley, California 94705-1927
- jrs at cs.berkeley.edu
-License: netlib-trinagle
- This program may be freely redistributed under the condition that the
- copyright notices (including this entire header and the copyright
- notice printed when the `-h' switch is selected) are not removed, and
- no compensation is received. Private, research, and institutional
- use is free. You may distribute modified versions of this code UNDER
- THE CONDITION THAT THIS CODE AND ANY MODIFICATIONS MADE TO IT IN THE
- SAME FILE REMAIN UNDER COPYRIGHT OF THE ORIGINAL AUTHOR, BOTH SOURCE
- AND OBJECT CODE ARE MADE FREELY AVAILABLE WITHOUT CHARGE, AND CLEAR
- NOTICE IS GIVEN OF THE MODIFICATIONS. Distribution of this code as
- part of a commercial system is permissible ONLY BY DIRECT ARRANGEMENT
- WITH THE AUTHOR. (If you are not directly supplying this code to a
- 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.
@@ -278,13 +257,7 @@ Files: CMake/CppcheckTargets.cmake
Copyright: Iowa State University 2009-2010.
License: BSL-1.0
-Files: CMake/ExternalData.cmake
- CMake/FindGTest.cmake
- CMake/FindICU.cmake
- CMake/FindITKPythonLibs.cmake
- CMake/FindKWStyle.cmake
- CMake/GenerateExportHeader.cmake
- CMake/GoogleTest.cmake
+Files: CMake/FindKWStyle.cmake
CMake/ITK_CheckCCompilerFlag.cmake
CMake/ITK_CheckCXXCompilerFlag.cmake
Copyright: 2000-2018 Kitware, Inc. and Contributors
@@ -296,14 +269,6 @@ Copyright:
Copyright 2004-2008 Roman Yakovenko
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
=====================================
debian/rules
=====================================
@@ -98,6 +98,8 @@ override_dh_lintian:
echo "#ITK embeds various patched libraries" > debian/$(pkg_lib).lintian-overrides
echo "$(pkg_lib): embedded-library" > debian/$(pkg_lib).lintian-overrides
echo "$(pkg_lib): package-name-doesnt-match-sonames" >> debian/$(pkg_lib).lintian-overrides
+ echo "$(pkg_lib): shared-library-lacks-prerequisites" >> debian/$(pkg_lib).lintian-overrides
+ echo "${pkg_dev}: no-manual-page usr/bin/itkTestDriver" > debian/$(pkg_dev).lintian-overrides
dh_lintian
override_dh_install-indep:
@@ -112,8 +114,8 @@ override_dh_install-arch:
# pkg_dev
dh_installman -p$(pkg_dev) debian/insighttoolkit.3
dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/lib*.so usr/lib
-
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/ITK-$(SOVERSION)/*
+ # The itkTestDriver seems to be required due to references in /usr/lib/cmake files; c.f. Bug #700723
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/bin/itkTestDriver
dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/cmake
@@ -142,8 +144,25 @@ control-file:
&& rm -f debian/control.tmp && exit 0; \
mv debian/control.tmp debian/control
+# The Debian source tarball is created by combining the upstream source and data tarballs
+# For ITK 5.2.1 this was done manually:
+#
+# 1. Download manually:
+# a. https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.2.1/InsightToolkit-5.2.1.tar.gz
+# b. https://github.com/InsightSoftwareConsortium/ITK/releases/download/v5.2.1/InsightData-5.2.1.tar.gz
+#
+# 2. Extract in "tarballs", create new merged source tarball:
+# mv ~/Downloads/Insight* .
+# tar xzf InsightToolkit-5.2.1.tar.gz
+# tar xzf InsightData-5.2.1.tar.gz
+# tar --xz -cf insighttoolkit5_5.2.1.orig.tar.xz InsightToolkit-5.2.1
+#
+# 3. Import into GIT
+# gbp import-orig --pristine-tar ../tarballs/insighttoolkit5_5.2.1.orig.tar.xz
+
TARBALLDIR = "../tarballs"
get-orig-source:
- uscan --watchfile debian/data/watch --force-download --no-symlink --destdir $(TARBALLDIR)
- uscan --force-download --rename --destdir $(TARBALLDIR)
- cd $(TARBALLDIR) && mv `ls InsightData-$(VERSION).tar.xz` insighttoolkit$(VER_MAJOR)_$(VERSION)-dfsg1.orig-data.tar.xz
+ echo "Create manually; see rules"
+ #uscan --watchfile debian/data/watch --force-download --no-symlink --destdir $(TARBALLDIR)
+ #uscan --force-download --rename --destdir $(TARBALLDIR)
+ #cd $(TARBALLDIR) && mv `ls InsightData-$(VERSION).tar.xz` insighttoolkit$(VER_MAJOR)_$(VERSION)-dfsg1.orig-data.tar.xz
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/c2479c8f41a1d35665ee0d7f13deb2e5b0d840e8...3219a3ebf653e4b47660017b9d2ca2f25e55daa9
--
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/c2479c8f41a1d35665ee0d7f13deb2e5b0d840e8...3219a3ebf653e4b47660017b9d2ca2f25e55daa9
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211031/9bbabb0d/attachment-0001.htm>
More information about the debian-med-commit
mailing list