[med-svn] [Git][med-team/dcmtk][master] 5 commits: Set DATDIC in CMakeLists.txt

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / dcmtk


Commits:
c9ffaf88 by Gert Wollny at 2018-08-07T23:21:16Z
Set DATDIC in CMakeLists.txt

- - - - -
aaf898ea by Gert Wollny at 2018-08-09T19:28:59Z
d/p/03: Update DIC install destination

- - - - -
a3156448 by Gert Wollny at 2018-08-09T19:29:44Z
d/rules: Remove install of /etc files that are gone

- - - - -
04fbfb7f by Gert Wollny at 2018-08-09T19:32:06Z
d/ Update SO version to 13

- - - - -
ba592c93 by Gert Wollny at 2018-08-09T19:33:03Z
Update changelog

- - - - -


6 changed files:

- debian/changelog
- debian/control
- 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,13 @@ 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
+  * d/ .gitlab-ci.yml: Add this CI file
+  * Set DATDIC in CMakeLists.txt
+  * d/p/03: Update DIC install destination
+  * d/rules: Remove install of /etc files that are gone
+  * d/ Update SO version to 13
 
- -- Gert Wollny <gewo at debian.org>  Mon, 06 Aug 2018 14:03:30 +0200
+ -- Gert Wollny <gewo at debian.org>  Thu, 09 Aug 2018 21:32:31 +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/libdcmtk12.install → debian/libdcmtk13.install
=====================================
--- a/debian/libdcmtk12.install
+++ b/debian/libdcmtk13.install
@@ -1,2 +1,2 @@
 usr/lib/*.so.*
-usr/share/libdcmtk12/*.dic
+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
@@ -32,9 +32,11 @@ Author: Mathieu Malaterre <malat at debian.org>
      SET(DCM_DICT_DEFAULT_PATH "")
 --- a/dcmdata/data/CMakeLists.txt
 +++ b/dcmdata/data/CMakeLists.txt
-@@ -1,5 +1,6 @@
+@@ -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}")
++
 +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
@@ -59,12 +59,6 @@ override_dh_auto_build-indep:
 # No tests needed for docs
 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 
 	DESTDIR=$(CURDIR)/debian/tmp $(MAKE) -C obj-*/dcmwlm/data install 



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/compare/33a40fa4dcb6981d1cdd529d1f0d1f970b627079...ba592c934bd3a38f7a30cf2c94864c2087761867

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/compare/33a40fa4dcb6981d1cdd529d1f0d1f970b627079...ba592c934bd3a38f7a30cf2c94864c2087761867
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/20180809/d6d25e90/attachment-0001.html>