Flavien Bridault pushed to branch master at Debian Med / sight
Commits: fd33b762 by Flavien Bridault at 2019-12-04T11:37:27Z cme fix dpkg - - - - - e2774111 by Flavien Bridault at 2019-12-04T14:49:04Z Add patch to be compatible with glm 0.9.9.6 - - - - - 6 changed files: - − debian/compat - debian/control - debian/copyright - + debian/patches/fix-glm-missing-cmake.patch - debian/patches/fix_version_getter.patch - debian/patches/series Changes: ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <[email protected]. Uploaders: Flavien Bridault <[email protected]> Section: science Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 11), cmake, libboost-all-dev, zlib1g-dev, @@ -16,21 +16,22 @@ Build-Depends: debhelper (>= 11~), libqt5x11extras5-dev, qttools5-dev, libvtk7-dev, - libgdcm2-dev, + libgdcm-dev, libinsighttoolkit4-dev, libann-dev, - libvtkgdcm2-dev, + libvtkgdcm-dev, libvtk7.1-qt, libvtk7-qt-dev, libcamp0.7-dev, libglm-dev, + libminc-dev, xvfb, xauth, dcmtk, dbus-x11, rdfind, symlinks -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/med-team/sight Vcs-Git: https://salsa.debian.org/med-team/sight.git Homepage: https://git.ircad.fr/Sight/sight @@ -110,7 +111,7 @@ Architecture: any Depends: libsight (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: DICOM viewer +Description: DICOM viewer Medical image viewer featuring negatoscope, multi-planar reconstruction, and volume rendering. . ===================================== debian/copyright ===================================== @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: sight Source: https://git.ircad.fr/Sight/sight ===================================== debian/patches/fix-glm-missing-cmake.patch ===================================== @@ -0,0 +1,63 @@ +Author: Flavien Bridault <[email protected]> +Description: Handle removal of CMake files from GLM. + +--- sight.orig/Bundles/maths/maths/CMakeLists.txt ++++ sight/Bundles/maths/maths/CMakeLists.txt +@@ -1,7 +1,5 @@ + fwLoadProperties() + +-find_package(glm QUIET REQUIRED) +- + fwInclude( + + ${GLM_INCLUDE_DIRS} +--- sight.orig/Bundles/simu/echoEdSimu/CMakeLists.txt ++++ sight/Bundles/simu/echoEdSimu/CMakeLists.txt +@@ -1,7 +1,5 @@ + fwLoadProperties() + +-find_package(glm QUIET REQUIRED) +- + fwForwardInclude( + ${GLM_INCLUDE_DIRS} + ) +--- sight.orig/Bundles/ui/uiVisuQt/CMakeLists.txt ++++ sight/Bundles/ui/uiVisuQt/CMakeLists.txt +@@ -2,7 +2,6 @@ + + find_package(Boost QUIET COMPONENTS regex REQUIRED) + find_package(Qt5 QUIET COMPONENTS Core Gui Widgets REQUIRED) +-find_package(glm QUIET REQUIRED) + + fwForwardInclude( + ${Boost_INCLUDE_DIRS} +--- sight.orig/SrcLib/calibration/calibration3d/test/CMakeLists.txt ++++ sight/SrcLib/calibration/calibration3d/test/CMakeLists.txt +@@ -1,6 +1,5 @@ + fwLoadProperties() + +-find_package(glm QUIET REQUIRED) + find_package(CppUnit QUIET REQUIRED) + + target_link_libraries(${FWPROJECT_NAME} PRIVATE ${CPPUNIT_LIBRARIES}) +--- sight.orig/SrcLib/core/fwDataTools/CMakeLists.txt ++++ sight/SrcLib/core/fwDataTools/CMakeLists.txt +@@ -1,6 +1,5 @@ + fwLoadProperties() + +-find_package(glm QUIET REQUIRED) + + fwForwardInclude( + ${GLM_INCLUDE_DIRS} +--- sight.orig/SrcLib/core/fwMath/CMakeLists.txt ++++ sight/SrcLib/core/fwMath/CMakeLists.txt +@@ -1,7 +1,5 @@ + fwLoadProperties() + +-find_package(glm QUIET REQUIRED) +- + fwForwardInclude( + ${GLM_INCLUDE_DIRS} +-) +\ No newline at end of file ++) ===================================== debian/patches/fix_version_getter.patch ===================================== @@ -1,5 +1,5 @@ Author: Flavien Bridault <[email protected]> -Description: Sight version should be passed from the build parameters and not from the git repository. +Description: Pass Sight version from the build parameters instead of the git repo. --- sight.orig/CMake/build/macros.cmake +++ sight/CMake/build/macros.cmake ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ +fix-glm-missing-cmake.patch skip_conan_deps.patch fix_version_getter.patch fix_launcher_library_path.patch View it on GitLab: https://salsa.debian.org/med-team/sight/compare/bfeab9727dd65bb0da89dee2c454b62ccbd36465...e27741110529803357639282d0fa0ab5811173a5 -- View it on GitLab: https://salsa.debian.org/med-team/sight/compare/bfeab9727dd65bb0da89dee2c454b62ccbd36465...e27741110529803357639282d0fa0ab5811173a5 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
