[med-svn] [Git][med-team/insighttoolkit][master] 9 commits: Fix watch file

Andreas Tille (@tille) gitlab at salsa.debian.org
Mon Jan 10 09:51:43 GMT 2022



Andreas Tille pushed to branch master at Debian Med / insighttoolkit


Commits:
4b475eb2 by Andreas Tille at 2022-01-10T08:29:23+01:00
Fix watch file

- - - - -
882b058a by Andreas Tille at 2022-01-10T08:32:05+01:00
routine-update: Standards-Version: 4.6.0

- - - - -
a78b0245 by Andreas Tille at 2022-01-10T08:32:34+01:00
routine-update: Add salsa-ci file

- - - - -
ddf8a351 by Andreas Tille at 2022-01-10T08:32:35+01:00
routine-update: Rules-Requires-Root: no

- - - - -
ee5ed988 by Andreas Tille at 2022-01-10T08:32:52+01:00
Replace spaces in short license names with dashes.

Changes-By: lintian-brush
Fixes: lintian: space-in-std-shortname-in-dep5-copyright
See-also: https://lintian.debian.org/tags/space-in-std-shortname-in-dep5-copyright.html

- - - - -
bca42f28 by Andreas Tille at 2022-01-10T08:37:57+01:00
Propagate changes in d/control to d/control.in

- - - - -
b6d0d438 by Andreas Tille at 2022-01-10T08:40:43+01:00
Use UTC timestamp for build date

- - - - -
f86e6f51 by Andreas Tille at 2022-01-10T08:55:19+01:00
New upstream version 5.2.1
- - - - -
35911ecb by Andreas Tille at 2022-01-10T10:45:26+01:00
Upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/control.in
- debian/copyright
- + debian/patches/0003-Modules-Core-Common-src-CMakeLists.txt-Use-UTC-times.patch
- debian/patches/series
- + debian/salsa-ci.yml
- debian/watch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,19 @@
+insighttoolkit5 (5.2.1-3) unstable; urgency=medium
+
+  * Team upload.
+  
+  [ Andreas Tille ]
+  * Fix watch file
+  * Standards-Version: 4.6.0 (routine-update)
+  * Add salsa-ci file (routine-update)
+  * Rules-Requires-Root: no (routine-update)
+
+  [ Vagrant Cascadian ]
+  * Use UTC timestamp for build date
+    Closes: #1003319
+
+ -- Andreas Tille <tille at debian.org>  Mon, 10 Jan 2022 08:55:23 +0100
+
 insighttoolkit5 (5.2.1-2) unstable; urgency=medium
 
   [ Steve Robbins ]


=====================================
debian/control
=====================================
@@ -1,37 +1,39 @@
 Source: insighttoolkit5
-Homepage: http://www.itk.org/
-Section: science
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>,
            Gert Wollny <gewo at debian.org>
+Section: science
+Priority: optional
 Build-Depends: debhelper-compat (= 13),
-    cmake (>= 2.8.9),
-    swig,
-    castxml (>= 0.3.4-2),
-    zlib1g-dev (>= 1.2.2),
-    libdouble-conversion-dev,
-    libexpat-dev,
-    libpng-dev,
-    libtiff-dev,
-    libfftw3-dev,
-    libdcmtk-dev (>= 3.6.1~20150924-4),
-    libgdcm-dev,
-    libgtest-dev,
-    uuid-dev,
-    libminc-dev,
-    libnifti2-dev,
-    libhdf5-dev
+               cmake,
+               swig,
+               castxml (>= 0.3.4-2),
+               zlib1g-dev,
+               libdouble-conversion-dev,
+               libexpat-dev,
+               libpng-dev,
+               libtiff-dev,
+               libfftw3-dev,
+               libdcmtk-dev,
+               libgdcm-dev,
+               libgtest-dev,
+               uuid-dev,
+               libminc-dev,
+               libnifti2-dev,
+               libhdf5-dev
 #	libvtk6-dev -- only needed if we enable one of the following modules:
 # VtkGlue, LevelSetsv4Visualization
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/insighttoolkit
 Vcs-Git: https://salsa.debian.org/med-team/insighttoolkit.git
+Homepage: http://www.itk.org/
+Rules-Requires-Root: no
 
 Package: libinsighttoolkit5.2
-Section: libs
 Architecture: amd64
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: libs
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: Image processing toolkit for registration and segmentation - runtime
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and
@@ -46,13 +48,27 @@ Description: Image processing toolkit for registration and segmentation - runtim
  This package contains the libraries needed to run ITK applications.
 
 Package: libinsighttoolkit5-dev
-Section: libdevel
 Architecture: amd64
-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, libinsighttoolkit4-dev
-Replaces: libinsighttoolkit-dev, libinsighttoolkit3-dev, libinsighttoolkit4-dev
+Section: libdevel
+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
 Suggests: insighttoolkit5-examples
+Conflicts: libinsighttoolkit-dev,
+           libinsighttoolkit3-dev,
+           libinsighttoolkit4-dev
+Replaces: libinsighttoolkit-dev,
+          libinsighttoolkit3-dev,
+          libinsighttoolkit4-dev
 Description: Image processing toolkit for registration and segmentation - development
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and
@@ -68,9 +84,10 @@ Description: Image processing toolkit for registration and segmentation - develo
  ITK applications.
 
 Package: insighttoolkit5-examples
-Section: devel
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Section: devel
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: libinsighttoolkit5-dev
 Description: Image processing toolkit for registration and segmentation - examples
  ITK is an open-source software toolkit for performing registration and


=====================================
debian/control.in
=====================================
@@ -1,37 +1,39 @@
 Source: insighttoolkit5
-Homepage: http://www.itk.org/
-Section: science
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>,
            Gert Wollny <gewo at debian.org>
+Section: science
+Priority: optional
 Build-Depends: debhelper-compat (= 13),
-    cmake (>= 2.8.9),
-    swig,
-    castxml (>= 0.3.4-2),
-    zlib1g-dev (>= 1.2.2),
-    libdouble-conversion-dev,
-    libexpat-dev,
-    libpng-dev,
-    libtiff-dev,
-    libfftw3-dev,
-    libdcmtk-dev (>= 3.6.1~20150924-4),
-    libgdcm-dev,
-    libgtest-dev,
-    uuid-dev,
-    libminc-dev,
-    libnifti2-dev,
-    libhdf5-dev
+               cmake,
+               swig,
+               castxml (>= 0.3.4-2),
+               zlib1g-dev,
+               libdouble-conversion-dev,
+               libexpat-dev,
+               libpng-dev,
+               libtiff-dev,
+               libfftw3-dev,
+               libdcmtk-dev,
+               libgdcm-dev,
+               libgtest-dev,
+               uuid-dev,
+               libminc-dev,
+               libnifti2-dev,
+               libhdf5-dev
 #	libvtk6-dev -- only needed if we enable one of the following modules:
 # VtkGlue, LevelSetsv4Visualization
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/med-team/insighttoolkit
 Vcs-Git: https://salsa.debian.org/med-team/insighttoolkit.git
+Homepage: http://www.itk.org/
+Rules-Requires-Root: no
 
 Package: libinsighttoolkit at SOVERSION@
+Architecture: amd64
 Section: libs
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: Image processing toolkit for registration and segmentation - runtime
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and
@@ -46,13 +48,27 @@ Description: Image processing toolkit for registration and segmentation - runtim
  This package contains the libraries needed to run ITK applications.
 
 Package: libinsighttoolkit at VER_MAJOR@-dev
+Architecture: amd64
 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, libinsighttoolkit4-dev
-Replaces: libinsighttoolkit-dev, libinsighttoolkit3-dev, libinsighttoolkit4-dev
+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
 Suggests: insighttoolkit at VER_MAJOR@-examples
+Conflicts: libinsighttoolkit-dev,
+           libinsighttoolkit3-dev,
+           libinsighttoolkit4-dev
+Replaces: libinsighttoolkit-dev,
+          libinsighttoolkit3-dev,
+          libinsighttoolkit4-dev
 Description: Image processing toolkit for registration and segmentation - development
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and
@@ -68,9 +84,10 @@ Description: Image processing toolkit for registration and segmentation - develo
  ITK applications.
 
 Package: insighttoolkit at VER_MAJOR@-examples
-Section: devel
 Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Section: devel
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Suggests: libinsighttoolkit at VER_MAJOR@-dev
 Description: Image processing toolkit for registration and segmentation - examples
  ITK is an open-source software toolkit for performing registration and


=====================================
debian/copyright
=====================================
@@ -65,7 +65,7 @@ License: BSD 3-Clause License
 
 Files: Modules/ThirdParty/Eigen3/*
 Copyright: Copyright (c) 2011, Intel Corporation
-License: Mozilla Public License 2.0
+License: MPL-2.0
 
 Files: Modules/ThirdParty/Expat/*
 Copyright: Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper
@@ -101,7 +101,7 @@ License: Redistribution and use in source and binary forms, with or without
 
 Files: Modules/ThirdParty/GIFTI/src/gifticlib/*
 Authors: Richard Reynolds, SSCC, DIRP, NIMH, National Institutes of Health
-License: Public domain
+License: Public-domain
  The gifticlib code is released into the public domain.  Developers are
  encouraged to incorporate the library into their application, and to
  contribute changes or enhancements to gifticlib.


=====================================
debian/patches/0003-Modules-Core-Common-src-CMakeLists.txt-Use-UTC-times.patch
=====================================
@@ -0,0 +1,30 @@
+From: Vagrant Cascadian <vagrant at reproducible-builds.org>
+Date: Fri, 7 Jan 2022 23:39:29 +0000
+Subject: [PATCH 1/3] Modules/Core/Common/src/CMakeLists.txt: Use UTC
+ timestamp.
+Bug-Debian: https://bugs.debian.org/1003319
+
+While cmake respects SOURCE_DATE_EPOCH, the timezone may still change
+the embedded timestamp used.
+
+https://reproducible-builds.org/docs/source-date-epoch/
+---
+ Modules/Core/Common/src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Modules/Core/Common/src/CMakeLists.txt b/Modules/Core/Common/src/CMakeLists.txt
+index 774a164d..1486c670 100644
+--- a/Modules/Core/Common/src/CMakeLists.txt
++++ b/Modules/Core/Common/src/CMakeLists.txt
+@@ -8,7 +8,7 @@ if( GIT_LOCAL_MODIFICATIONS MATCHES ".*files changed.*")
+    set(GIT_LOCAL_MODIFICATIONS " (with uncommitted code modifications ${GIT_LOCAL_MODIFICATIONS} )")
+ endif()
+ 
+-string(TIMESTAMP CONFIGURE_DATE "%Y-%m-%d %H:%M")
++string(TIMESTAMP CONFIGURE_DATE "%Y-%m-%d %H:%M" UTC)
+ 
+ ## MAKE_MAP_ENTRY is a macro to facilitate placing items in the itk::BuildInformation class
+ ##                /--------------------------_---------------------------_-------------------------------------------------/
+-- 
+2.34.1
+


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 0001-Fix-building-and-running-with-system-MINC.patch
 0002-Do-not-unconditionally-enable-SSE-for-i386.patch
+0003-Modules-Core-Common-src-CMakeLists.txt-Use-UTC-times.patch


=====================================
debian/salsa-ci.yml
=====================================
@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml


=====================================
debian/watch
=====================================
@@ -1,8 +1,4 @@
 version=4
 
-# WARNING: the version specification is forced to v4.x.y for the source code of
-# the branch holding src:insighttoolkit4, but there are more recent versions
-# available (5.0 and 5.1 to 2020-08-02).
-opts="repacksuffix=-dfsg1,dversionmangle=s/-dfsg1//" \
 https://itk.org/download/ \
-https://github.com/InsightSoftwareConsortium/ITK/releases/download/v4.\d[\-+\.:\~\da-zA-Z]*/InsightToolkit- at ANY_VERSION@@ARCHIVE_EXT@
+https://github.com/InsightSoftwareConsortium/ITK/releases/download/v.*/InsightToolkit-(\d[.\d]+)@ARCHIVE_EXT@



View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/d20d63389e338a531484e0c0b9a462b9d99ee29c...35911ecb287f8f882259dde1b08b1b57e957202e

-- 
View it on GitLab: https://salsa.debian.org/med-team/insighttoolkit/-/compare/d20d63389e338a531484e0c0b9a462b9d99ee29c...35911ecb287f8f882259dde1b08b1b57e957202e
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/20220110/3f534c57/attachment-0001.htm>


More information about the debian-med-commit mailing list