[med-svn] [Git][med-team/camitk][upstream-ci/master] 2 commits: update d/c

[Emmanuel Promayon]

Emmanuel Promayon pushed to branch upstream-ci/master at Debian Med / camitk


Commits:
2ef6be7c by Emmanuel at 2020-07-05T15:26:27+02:00
update d/c

- - - - -
fb12855a by Emmanuel at 2020-07-06T08:10:00+02:00
Add path to the new viewer extensions type

This path is required in LD_LIBRARY_PATH in order to load
the viewer shared objects during test

- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
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-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                cmake,
                libvtk7-dev,
                libvtk7-qt-dev,
@@ -21,7 +21,7 @@ Build-Depends: debhelper-compat (= 12),
                xauth,
                doxygen,
                graphviz
-Standards-Version: 4.4.1
+Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/med-team/camitk
 Vcs-Git: https://salsa.debian.org/med-team/camitk.git
 Homepage: https://camitk.imag.fr/


=====================================
debian/rules
=====================================
@@ -29,6 +29,8 @@ 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)
 PKG_LIB_DIR := $(CURDIR)/debian/${pkg_lib}/usr/lib/camitk-${VER_SHORT}
+# for viewer extensions:
+LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PKG_LIB_DIR)/viewers/
 # for component extensions:
 LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PKG_LIB_DIR)/components/
 # for action extensions:
@@ -38,7 +40,7 @@ LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(PKG_LIB_DIR)/
 # during test, the build dir path is also needed
 LIB_BUILD_DIR := $(CURDIR)/camitk-build/lib
 PRIVATE_LIB_BUILD_DIR := $(LIB_BUILD_DIR)/camitk-${VER_SHORT}
-LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(LIB_BUILD_DIR):$(PRIVATE_LIB_BUILD_DIR)/components/:$(PRIVATE_LIB_BUILD_DIR)/actions/:$(PRIVATE_LIB_BUILD_DIR)/
+LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(LIB_BUILD_DIR):$(PRIVATE_LIB_BUILD_DIR)/viewers/:$(PRIVATE_LIB_BUILD_DIR)/components/:$(PRIVATE_LIB_BUILD_DIR)/actions/:$(PRIVATE_LIB_BUILD_DIR)/
 # export for all d/rules subshell (test and dpkg-shlibdeps included)
 export LD_LIBRARY_PATH
 



View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/0a5a42e426f3c2909a03caa2371f51d0eba32645...fb12855acd8f350bd1689cfef7a49044e4068949

-- 
View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/0a5a42e426f3c2909a03caa2371f51d0eba32645...fb12855acd8f350bd1689cfef7a49044e4068949
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/20200706/3487e90c/attachment-0001.html>