[med-svn] [Git][med-team/camitk][master] 7 commits: Adapt (Build-)Depends of libgdcm to new names

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / camitk


Commits:
3916c1c5 by Andreas Tille at 2020-01-20T12:13:51+01:00
Adapt (Build-)Depends of libgdcm to new names

- - - - -
fc874294 by Andreas Tille at 2020-01-20T12:14:13+01:00
routine-update: debhelper-compat 12

- - - - -
c22f4af4 by Andreas Tille at 2020-01-20T12:14:20+01:00
routine-update: Standards-Version: 4.4.1

- - - - -
dc64522b by Andreas Tille at 2020-01-20T13:05:00+01:00
routine-update: DEB_BUILD_OPTIONS allow override_dh_auto_test

- - - - -
932398d9 by Andreas Tille at 2020-01-20T13:05:18+01:00
Rely on pre-initialized dpkg-architecture variables.

Fixes: lintian: debian-rules-sets-dpkg-architecture-variable
See-also: https://lintian.debian.org/tags/debian-rules-sets-dpkg-architecture-variable.html

- - - - -
a00b14fb by Andreas Tille at 2020-01-20T13:13:50+01:00
Fix syntax

- - - - -
14cf71fb by Andreas Tille at 2020-01-20T14:12:54+01:00
Upload to unstable

- - - - -


4 changed files:

- debian/changelog
- − debian/compat
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+camitk (4.1.2-4) unstable; urgency=medium
+
+  * Adapt (Build-)Depends of libgdcm to new names
+    Closes: #949349
+  * debhelper-compat 12 (routine-update)
+  * Standards-Version: 4.4.1 (routine-update)
+  * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target (routine-
+    update)
+  * Rely on pre-initialized dpkg-architecture variables.
+
+ -- Andreas Tille <tille at debian.org>  Mon, 20 Jan 2020 13:05:20 +0100
+
 camitk (4.1.2-3) unstable; urgency=medium
 
   [ Andreas Beckmann ]


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Andreas Tille <tille at debian.org>,
            Emmanuel Promayon <Emmanuel.Promayon at univ-grenoble-alpes.fr>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 11~),
+Build-Depends: debhelper-compat (= 12),
                cmake,
                libvtk7-dev,
                libvtk7-qt-dev,
@@ -15,13 +15,13 @@ Build-Depends: debhelper (>= 11~),
                xsdcxx,
                libinsighttoolkit4-dev,
                libfftw3-dev,
-               libgdcm2-dev,
-               libvtkgdcm2-dev,
+               libgdcm-dev,
+               libvtkgdcm-dev,
                xvfb,
                xauth,
                doxygen,
                graphviz
-Standards-Version: 4.3.0
+Standards-Version: 4.4.1
 Vcs-Browser: https://salsa.debian.org/med-team/camitk
 Vcs-Git: https://salsa.debian.org/med-team/camitk.git
 Homepage: https://camitk.imag.fr/
@@ -73,8 +73,8 @@ Depends: libcamitk4 (= ${binary:Version}),
          xsdcxx,
          libinsighttoolkit4-dev,
          libfftw3-dev,
-         libgdcm2-dev,
-         libvtkgdcm2-dev,
+         libgdcm-dev,
+         libvtkgdcm-dev,
          xvfb,
          xauth,
          ${misc:Depends},
@@ -85,7 +85,7 @@ Breaks: libcamitk3-dev,
         libvtk6-dev,
         libvtk6-java,
         libvtk6-jni,
-        libvtk6-qt-dev,
+        libvtk6-qt-dev
 Replaces: libcamitk3-dev
 Description: Computer Assisted Medical Intervention Tool Kit - development
  Helps researchers and clinicians to easily and rapidly collaborate in


=====================================
debian/rules
=====================================
@@ -24,7 +24,7 @@ pkg_imp = camitk-imp
 pkg_asm = camitk-actionstatemachine
 
 # multi-arch support
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
 
 # dpkg-shlibdeps needs to know about camitk extension directories to manage inner-dependencies
 # between extensions (i.e., mml component extension depends on physicalmodel component extensions)
@@ -73,15 +73,20 @@ override_dh_auto_build-indep:
 
 # No tests needed for docs
 override_dh_auto_test-indep:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	echo "No tests availaible just for the docs"
+endif
 
 # run all the available tests (only for Archictecture: any
 # as tests can only be run if and once the framework is build)
 override_dh_auto_test-arch:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Use the CamiTK test suite
 	# Note: all tests require an X server, xvfb-run is needed to have a virtual one
 	# Another way: xvfb-run --auto-servernum $(MAKE) -C camitk-build ARGS="-V" test
 	# e.g. to test config: (cd camitk-build && xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ctest -VV --timeout 1800 -R application-config)
 	(cd camitk-build && xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24" ctest -V --timeout 1800)
+endif
 
 # make packages
 override_dh_install:



View it on GitLab: https://salsa.debian.org/med-team/camitk/compare/390ed1d4e9dbc9b9dd5f1a9a9603ca3ade15eec5...14cf71fb74a61cb9c5c626a706835252fc360ce4

-- 
View it on GitLab: https://salsa.debian.org/med-team/camitk/compare/390ed1d4e9dbc9b9dd5f1a9a9603ca3ade15eec5...14cf71fb74a61cb9c5c626a706835252fc360ce4
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/20200120/85b45703/attachment-0001.html>