Andreas Tille pushed to branch master at Debian Med / camitk
Commits: 9bfced75 by Andreas Tille at 2022-02-08T08:13:03+01:00 Fix compilation by removing ixx files - - - - - 6773e00c by Andreas Tille at 2022-02-08T08:16:47+01:00 Changelog syntax - - - - - 64ad9866 by Andreas Tille at 2022-02-08T08:18:36+01:00 Adapt lintian-overrides to soversion - - - - - 7e0eedd3 by Andreas Tille at 2022-02-08T08:20:04+01:00 another syntax fix in d/changelog - - - - - f7b7a346 by Andreas Tille at 2022-02-08T08:29:22+01:00 Adapt patch to ignore .ixx files to new upstream version - - - - - 5 changed files: - debian/changelog - − debian/libcamitk4.lintian-overrides - + debian/libcamitk5.lintian-overrides - + debian/patches/0006-exlude-ixx-files-from-cmake.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,5 +1,6 @@ camitk (5.0.2-1) UNRELEASED; urgency=medium + [ Andreas Tille ] * New upstream version * Standards-Version: 4.6.0 (routine-update) * debhelper-compat 13 (routine-update) @@ -8,8 +9,13 @@ camitk (5.0.2-1) UNRELEASED; urgency=medium * (Build-)Depends libinsighttoolkit5-dev * Bump package version number and version numbers in Breaks fields * Build-Depends: libgdcm-tools + * Adapt lintian-overrides to soversion + + [ Jose Luis Rivero ] + * Fix compilation by removing ixx files + Closes: #997120 - -- Andreas Tille <[email protected]> Mon, 17 Jan 2022 09:33:47 +0100 + -- Andreas Tille <[email protected]> Tue, 08 Feb 2022 08:13:11 +0100 camitk (4.1.2-4) unstable; urgency=medium ===================================== debian/libcamitk4.lintian-overrides deleted ===================================== @@ -1,10 +0,0 @@ -# W overrides for package-name-doesnt-match-sonames -# The produced lib given by -# objdump -p camitk-build/lib/libcamitkcore.so.4.1.2 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/' -# is "libcamitkcore4" -# but the package is called libcamitk4 (as it is more than just the corelib) -# It is the same for libmonitoring4 -# objdump -p camitk-build/lib/libmonitoring.so.4.0.0 | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/' -# is "libmonitoring4" -# but it is in the package libcamitk4 -libcamitk4: package-name-doesnt-match-sonames libcamitkcore4 libmonitoring4 ===================================== debian/libcamitk5.lintian-overrides ===================================== @@ -0,0 +1,10 @@ +# W overrides for package-name-doesnt-match-sonames +# The produced lib given by +# objdump -p camitk-build/lib/libcamitkcore.so.5.* | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/' +# is "libcamitkcore5" +# but the package is called libcamitk5 (as it is more than just the corelib) +# It is the same for libmonitoring5 +# objdump -p camitk-build/lib/libmonitoring.so.5.* | sed -n -e's/^[[:space:]]*SONAME[[:space:]]*//p' | sed -r -e's/([0-9])\.so\./\1-/; s/\.so(\.|$)//; y/_/-/; s/(.*)/\L&/' +# is "libmonitoring5" +# but it is in the package libcamitk5 +libcamitk5: package-name-doesnt-match-sonames libcamitkcore5 libmonitoring5 ===================================== debian/patches/0006-exlude-ixx-files-from-cmake.patch ===================================== @@ -0,0 +1,84 @@ +Description: Exclude .ixx files from CMake + The .ixx files are not supported directly by the g++ compiler since the + extension is unknown to it. This raises a warning in the compiler and it is + making the compiler not to generate the object file. + The format can be forced by using -x c++ but the result won't compile at all + since the file seems to be designed to be used in combination with other + headers (other headers include them at the end of the file). + Removing the .ixx make the compilation to work. +Author: Jose Luis Rivero <[email protected]> +Forwarded: no +Last-Update: 2022-02-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/sdk/applications/actionstatemachine/CMakeLists.txt ++++ b/sdk/applications/actionstatemachine/CMakeLists.txt +@@ -1,6 +1,6 @@ + # use the application extension macro + camitk_application(NEEDS_QT_MODULES #we use QtXML +- ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx ++ ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx + CEP_NAME SDK + NEEDS_VIEWER_EXTENSION explorer interactivesliceviewer interactivegeometryviewer medicalimageviewer + DESCRIPTION "Simple action state machine to pipeline actions from an XML file" +--- a/sdk/applications/cepgenerator/CMakeLists.txt ++++ b/sdk/applications/cepgenerator/CMakeLists.txt +@@ -3,7 +3,7 @@ camitk_application(NO_GUI + NEEDS_XERCESC + NEEDS_CEP_LIBRARIES cepgenerator cepcoreschema + CEP_NAME SDK +- ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx ++ ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx + DESCRIPTION "Create CEP and file skeletons from XML files (no GUI)" + ) + +--- a/sdk/applications/config/CMakeLists.txt ++++ b/sdk/applications/config/CMakeLists.txt +@@ -1,5 +1,5 @@ + camitk_application(NO_GUI +- ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx ++ ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx + CEP_NAME SDK + DESCRIPTION "Provides information about your CamiTK configuration and installation" + ) +--- a/sdk/applications/testactions/CMakeLists.txt ++++ b/sdk/applications/testactions/CMakeLists.txt +@@ -4,7 +4,7 @@ + # + #-------------------------------------------- + camitk_application( NO_GUI +- ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx ++ ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx + CEP_NAME SDK + DESCRIPTION "Test application to test actions" + ) +--- a/sdk/applications/testcomponents/CMakeLists.txt ++++ b/sdk/applications/testcomponents/CMakeLists.txt +@@ -5,7 +5,7 @@ + #-------------------------------------------- + camitk_application( NO_GUI + CEP_NAME SDK +- ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx ++ ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx + DESCRIPTION "Test application to load components and interact with them" + ) + +--- a/sdk/applications/wizard/CMakeLists.txt ++++ b/sdk/applications/wizard/CMakeLists.txt +@@ -3,7 +3,7 @@ camitk_application(NEEDS_XSD + NEEDS_CEP_LIBRARIES cepgenerator cepcoreschema + NEEDS_VIEWER_EXTENSION explorer + CEP_NAME SDK +- ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx ++ ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx + DESCRIPTION "Create CEP and file skeletons from GUI" + ) + set(CAMITK_WIZARD_DEBUG CACHE BOOL FALSE) +--- a/sdk/applications/imp/CMakeLists.txt ++++ b/sdk/applications/imp/CMakeLists.txt +@@ -1,4 +1,4 @@ +-camitk_application( ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx CommandLineOptions.ixx ++camitk_application( ADDITIONAL_SOURCES CommandLineOptions.cxx CommandLineOptions.hxx + CEP_NAME SDK + NEEDS_VIEWER_EXTENSION actionviewer interactivesliceviewer interactivegeometryviewer medicalimageviewer explorer frameexplorer propertyexplorer + DESCRIPTION "All-in-one application to load actions and components and interact with them" ===================================== debian/patches/series ===================================== @@ -3,5 +3,6 @@ #0003-FIXED-warning-from-dpkg-about-no-newline.patch #0004-FIXED-monitorgui-lib-should-not-depends-on-camitk-co.patch #0005-FIXED-config-test-needs-to-ignore-stderr.patch +0006-exlude-ixx-files-from-cmake.patch #0010-Make-loop-safe-for-removal-of-elements.patch #0100-vtk7-compatibility.patch View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/a7ffc70b0d00e96575a8608085892469ef11150c...f7b7a346f696302eef19a2c7484670cc29a79d70 -- View it on GitLab: https://salsa.debian.org/med-team/camitk/-/compare/a7ffc70b0d00e96575a8608085892469ef11150c...f7b7a346f696302eef19a2c7484670cc29a79d70 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
