Gert Wollny pushed to branch master at Debian Med / dcmtk
Commits: 2fba35e2 by Gert Wollny at 2018-08-09T21:41:37Z d/ Update SO version to 13 - - - - - ce7924e1 by Gert Wollny at 2018-08-09T21:43:51Z d/p/03: Correct install path - - - - - c0e7bb6e by Gert Wollny at 2018-08-09T21:44:15Z update changelog - - - - - d26e763b by Gert Wollny at 2018-08-10T07:26:24Z d/Update install files - - - - - 9 changed files: - debian/changelog - debian/control - debian/dcmtk.install - debian/libdcmtk-dev.install - − debian/libdcmtk12.install - + debian/libdcmtk13.install - debian/libdcmtk12.lintian-overrides → debian/libdcmtk13.lintian-overrides - debian/patches/03_datadic_install.patch - debian/rules Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,15 @@ dcmtk (3.6.3-1) UNRELEASED; urgency=medium * d/watch: update link (thanks Pedro Fernando Arizpe Gómez) * New upstream version 3.6.3 * d/patches: Update patches to apply to new version - - -- Gert Wollny <[email protected]> Mon, 06 Aug 2018 14:03:30 +0200 + * d/ .gitlab-ci.yml: Add this CI file + * print tail of log if fail + * fail should also be reported + * Set DATDIC in CMakeLists.txt + * d/p/03: Update DIC install destination + * d/ Update SO version to 13 + * d/p/03: Correct install path + + -- Gert Wollny <[email protected]> Thu, 09 Aug 2018 23:44:06 +0200 dcmtk (3.6.2-3) unstable; urgency=medium ===================================== debian/control ===================================== --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Description: OFFIS DICOM toolkit command line utilities . Note: This version was compiled with libssl support. -Package: libdcmtk12 +Package: libdcmtk13 Architecture: any Section: libs Depends: ${misc:Depends}, @@ -67,7 +67,7 @@ Depends: libxml2-dev, libwrap0-dev, libcharls-dev, libtiff-dev, - libdcmtk12 (= ${binary:Version}), + libdcmtk13 (= ${binary:Version}), ${misc:Depends} Suggests: dcmtk-doc Breaks: libinsighttoolkit4-dev (<< 4.9.0) ===================================== debian/dcmtk.install ===================================== --- a/debian/dcmtk.install +++ b/debian/dcmtk.install @@ -1,10 +1,5 @@ usr/bin/* etc/dcmtk/* usr/share/dcmtk/*.css -usr/share/dcmtk/*.dump usr/share/dcmtk/*.lut -usr/share/dcmtk/dcm2xml.dtd usr/share/dcmtk/dsr2xml.xsd -usr/share/dcmtk/dumppat.txt -usr/share/dcmtk/wlistdb -usr/share/dcmtk/wlistqry ===================================== debian/libdcmtk-dev.install ===================================== --- a/debian/libdcmtk-dev.install +++ b/debian/libdcmtk-dev.install @@ -1,4 +1,4 @@ usr/include/dcmtk/* -usr/lib/*.so -usr/lib/cmake/ +usr/lib/*/*.so +usr/lib/*/cmake/ ===================================== debian/libdcmtk12.install deleted ===================================== --- a/debian/libdcmtk12.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/*.so.* -usr/share/libdcmtk12/*.dic ===================================== debian/libdcmtk13.install ===================================== --- /dev/null +++ b/debian/libdcmtk13.install @@ -0,0 +1,2 @@ +usr/lib/*/*.so.* +usr/share/libdcmtk13/*.dic ===================================== debian/libdcmtk12.lintian-overrides → debian/libdcmtk13.lintian-overrides ===================================== --- a/debian/libdcmtk12.lintian-overrides +++ b/debian/libdcmtk13.lintian-overrides @@ -1,5 +1,5 @@ # There is more than one library in one package bundles which makes perfectly # sense in this application but does not enable naming the library package apropriately -libdcmtk12: package-name-doesnt-match-sonames -libdcmtk12: embedded-library -libdcmtk12: no-symbols-control-file +libdcmtk13: package-name-doesnt-match-sonames +libdcmtk13: embedded-library +libdcmtk13: no-symbols-control-file ===================================== debian/patches/03_datadic_install.patch ===================================== --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -35,7 +35,7 @@ Author: Mathieu Malaterre <[email protected]> @@ -1,5 +1,8 @@ # declare installation files -INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data) -+SET(DCMTK_INSTALL_DATDIR "share/dcmtk${DCMTK_ABI_VERSION}") ++SET(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}") + +INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data) +INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data) ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -DDCMTK_WITH_ICONV:BOOL=ON \ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk12 \ + -DDCMTK_INSTALL_DATDIC:STRING=share/libdcmtk13 \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DDCMTK_USE_CXX11_STL:BOOL=ON \ -DDCMTK_ENABLE_CXX11:BOOL=ON @@ -62,8 +62,6 @@ override_dh_auto_test-indep: override_dh_auto_install-arch: dh_auto_install - # ?? - mv debian/tmp/usr/etc debian/tmp/ override_dh_auto_install-indep: DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/doxygen install View it on GitLab: https://salsa.debian.org/med-team/dcmtk/compare/ba592c934bd3a38f7a30cf2c94864c2087761867...d26e763b95b544ccf69a04a31fd4537912f44205 -- View it on GitLab: https://salsa.debian.org/med-team/dcmtk/compare/ba592c934bd3a38f7a30cf2c94864c2087761867...d26e763b95b544ccf69a04a31fd4537912f44205 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
