[med-svn] [Git][med-team/sight][master] 8 commits: routine-update: debhelper-compat 12

Andreas Tille gitlab at salsa.debian.org
Tue Dec 17 06:39:59 GMT 2019 


Andreas Tille pushed to branch master at Debian Med / sight


Commits:
beebb69d by Andreas Tille at 2019-12-10T10:23:56Z
routine-update: debhelper-compat 12

- - - - -
b0be7ecb by Andreas Tille at 2019-12-10T10:24:40Z
R-U: DEB_BUILD_OPTIONS allow override_dh_auto_test

- - - - -
00167179 by Andreas Tille at 2019-12-10T10:24:40Z
R-U: Trailing whitespace in debian/changelog

- - - - -
cb6599df by Andreas Tille at 2019-12-10T10:24:40Z
R-U: Trailing whitespace in debian/control

- - - - -
0009bb5a by Andreas Tille at 2019-12-10T10:24:40Z
R-U: Trailing whitespace in debian/rules

- - - - -
c60ad7ff by Andreas Tille at 2019-12-10T10:24:42Z
Trim trailing whitespace.

Fixes lintian: file-contains-trailing-whitespace
See https://lintian.debian.org/tags/file-contains-trailing-whitespace.html for more details.

- - - - -
ce252ec9 by Andreas Tille at 2019-12-10T10:24:51Z
Fix day-of-week for changelog entry 0.9.2-4.

Fixes lintian: debian-changelog-has-wrong-day-of-week
See https://lintian.debian.org/tags/debian-changelog-has-wrong-day-of-week.html for more details.

- - - - -
40d88676 by Andreas Tille at 2019-12-10T11:23:47Z
Upload to unstable

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,20 @@
-sight (19.0.0-2) UNRELEASED; urgency=medium
+sight (19.0.0-2) unstable; urgency=medium
 
+  [ Flavien Bridault ]
   * cme fix dpkg
   * Standards-Version: 4.4.1
   * d/p/fix-glm-missing-cmake.patch: add patch to be compatible with glm 0.9.9.6
   * d/control: add transitive dependency for ITK, update to gdcm 3
 
+  [ Andreas Tille ]
+  * debhelper-compat 12
+  * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target
+  * Remove trailing whitespace in debian/changelog
+  * Remove trailing whitespace in debian/control
+  * Remove trailing whitespace in debian/rules
+  * Trim trailing whitespace.
+  * Fix day-of-week for changelog entry 0.9.2-4.
+
  -- Flavien Bridault <fbridault at ircad.fr>  Wed, 04 Dec 2019 11:22:04 +0000
 
 sight (19.0.0-1) unstable; urgency=medium
@@ -35,7 +45,7 @@ sight (18.1.0-1) unstable; urgency=medium
 fw4spl (17.2.0-2) unstable; urgency=medium
 
   [ Flavien Bridault ]
-  * d/p/: add patch to build with dcmtk 3.6.4. Closes: #920457 
+  * d/p/: add patch to build with dcmtk 3.6.4. Closes: #920457
 
   [ Andreas Tille ]
   * Standards-Version: 4.3.0
@@ -54,7 +64,7 @@ fw4spl (17.2.0-1) unstable; urgency=medium
 fw4spl (14.0.0-1) unstable; urgency=medium
 
   [ Flavien Bridault ]
-  * New upstream version 
+  * New upstream version
   * d/p/: remove obsolete patches
     Add patch to enable experimental GLM extension. Closes: #888932
   * d/rules: update build options
@@ -91,7 +101,7 @@ fw4spl (11.0.4-1) unstable; urgency=medium
   * d/watch: Moved to official fw4spl fork
   * debhelper 10 (which enables parallel build as default). Closes: #797475.
   * d/control: Updated dependencies
-  * cme fix dpkg-control 
+  * cme fix dpkg-control
 
  -- Flavien Bridault <fbridault at ircad.fr>  Wed, 23 Nov 2016 09:58:17 +0100
 
@@ -103,7 +113,7 @@ fw4spl (0.9.2-4) unstable; urgency=medium
   * Support new boost version. Closes: #797481.
   * Forbid parallel build. Closes: #797475.
 
- -- Corentin Desfarges <corentin.desfarges.dev at gmail.com>  Thu, 21 Dec 2015 14:11:13 +0200
+ -- Corentin Desfarges <corentin.desfarges.dev at gmail.com>  Mon, 21 Dec 2015 14:11:13 +0200
 
 fw4spl (0.9.2-3) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Flavien Bridault <fbridault at ircad.fr>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 11),
+Build-Depends: debhelper-compat (= 12),
                cmake,
                libboost-all-dev,
                zlib1g-dev,
@@ -45,22 +45,22 @@ Conflicts: fw4spl
 Provides: fw4spl
 Replaces: fw4spl
 Description: Sight libraries
- The Surgical Image Guidance and 
- Healthcare Toolkit aims to ease the creation of 
- applications based on medical imaging. It includes 
- various features such as 2D and 3D digital image 
- processing, visualization, augmented reality and 
- medical interaction simulation. It runs on many 
+ The Surgical Image Guidance and
+ Healthcare Toolkit aims to ease the creation of
+ applications based on medical imaging. It includes
+ various features such as 2D and 3D digital image
+ processing, visualization, augmented reality and
+ medical interaction simulation. It runs on many
  different environments (Windows, Linux, macOS), is
- written in C++, and features rapid interface design 
+ written in C++, and features rapid interface design
  using XML files.
  .
- Sight was formerly known as FW4SPL. It was renamed 
- in 2018, firstly to make its purpose clearer, and 
- secondly as part of a major change in design and in 
+ Sight was formerly known as FW4SPL. It was renamed
+ in 2018, firstly to make its purpose clearer, and
+ secondly as part of a major change in design and in
  the governance of the development team.
  .
- This package provides the shared libraries needed to 
+ This package provides the shared libraries needed to
  run C++ programs that use Sight.
 
 Package: libsight-dev
@@ -89,19 +89,19 @@ Depends: libsight (= ${binary:Version}),
          ${shlibs:Depends},
          ${misc:Depends}
 Description: Sight header files
- The Surgical Image Guidance and 
- Healthcare Toolkit aims to ease the creation of 
- applications based on medical imaging. It includes 
- various features such as 2D and 3D digital image 
- processing, visualization, augmented reality and 
- medical interaction simulation. It runs on many 
+ The Surgical Image Guidance and
+ Healthcare Toolkit aims to ease the creation of
+ applications based on medical imaging. It includes
+ various features such as 2D and 3D digital image
+ processing, visualization, augmented reality and
+ medical interaction simulation. It runs on many
  different environments (Windows, Linux, macOS), is
- written in C++, and features rapid interface design 
+ written in C++, and features rapid interface design
  using XML files.
  .
- Sight was formerly known as FW4SPL. It was renamed 
- in 2018, firstly to make its purpose clearer, and 
- secondly as part of a major change in design and in 
+ Sight was formerly known as FW4SPL. It was renamed
+ in 2018, firstly to make its purpose clearer, and
+ secondly as part of a major change in design and in
  the governance of the development team.
  .
  This package contains the development files.
@@ -113,15 +113,15 @@ Depends: libsight (= ${binary:Version}),
          ${misc:Depends}
 Description: DICOM viewer
  Medical image viewer featuring negatoscope, multi-planar
- reconstruction, and volume rendering. 
+ reconstruction, and volume rendering.
  .
- Many image formats are handled such as DICOM, mhd, 
+ Many image formats are handled such as DICOM, mhd,
  inr.gz, vtk, vti,... Segmentations meshes can also
  be imported from DICOM and vtk formats, and visualized
  in mixed rendering with images.
  .
- Tools are provided to measure distances of 
+ Tools are provided to measure distances of
  structures in the image and to place landmarks.
  .
- Last, VRRender can also connect directly to a PACS, and 
+ Last, VRRender can also connect directly to a PACS, and
  then request, download or upload DICOM files.


=====================================
debian/rules
=====================================
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-#fix the lintian "hardening" message 
+#fix the lintian "hardening" message
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -20,8 +20,9 @@ override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DUSE_SYSTEM_LIB=ON -DPROJECTS_TO_BUILD="VRRender" -DPROJECTS_TO_INSTALL="VRRender" -DCMAKE_INSTALL_RPATH="/usr/lib/$(DEB_HOST_MULTIARCH)/sight" -Wno-dev -DENABLE_PCH=OFF -DBUILD_TESTS=OFF -DBUILD_SDK=ON -DGIT_TAG=$(DEB_VERSION_UPSTREAM) -DCMAKE_BUILD_TYPE=Release
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	echo "test disabled"
+endif
 
 override_dh_shlibdeps:
 	dh_shlibdeps -v -l/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/sight:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/Bundles:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/gui_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/io_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ctrlSelection_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ioITK_0-1/
-



View it on GitLab: https://salsa.debian.org/med-team/sight/compare/461155262e4d576664be182cf805689644d27ee1...40d886760d1261c315315364c16ec870e7936ca9

-- 
View it on GitLab: https://salsa.debian.org/med-team/sight/compare/461155262e4d576664be182cf805689644d27ee1...40d886760d1261c315315364c16ec870e7936ca9
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/20191217/72140c1d/attachment-0001.html>

More information about the debian-med-commit mailing list