[med-svn] [Git][med-team/dcmtk][master] 5 commits: d/rules, d/p/03: Fix DATADIC path, closes #913304

[Gert Wollny]

Gert Wollny pushed to branch master at Debian Med / dcmtk


Commits:
f15345d8 by Gert Wollny at 2019-01-19T08:56:16Z
d/rules,d/p/03: Fix DATADIC path, closes #913304

- - - - -
cec6f3b4 by Gert Wollny at 2019-01-19T08:56:37Z
Update Changelog

- - - - -
60111ea4 by Gert Wollny at 2019-01-19T09:20:59Z
Fix changelog entry

- - - - -
91666af2 by Gert Wollny at 2019-01-19T09:25:15Z
Update the patch again

- - - - -
8d4169a4 by Gert Wollny at 2019-01-19T09:36:42Z
Update changelog for upload

- - - - -


3 changed files:

- debian/changelog
- debian/patches/03_datadic_install.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+dcmtk (3.6.4-2) unstable; urgency=medium
+
+  * d/rules,d/p/03: Fix DATADIC path, Closes: #913304
+
+ -- Gert Wollny <gewo at debian.org>  Sat, 19 Jan 2019 10:36:10 +0100
+
 dcmtk (3.6.4-1) unstable; urgency=medium
 
   * d/p/09: Fix build with CharLS 2.0


=====================================
debian/patches/03_datadic_install.patch
=====================================
@@ -26,11 +26,11 @@ Author: Mathieu Malaterre <malat at debian.org>
    # Set dictionary path to the data dir inside install main dir (prefix)
    if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
      if(ENABLE_PRIVATE_TAGS)
 -      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic")
-+      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dcmtk\\\\private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\private.dic")
      endif()
       # Again, for Windows strip all / from path and replace it with \\.
      string(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
@@ -39,11 +39,11 @@ Author: Mathieu Malaterre <malat at debian.org>
    # Set dictionary path to the data dir inside install main dir (prefix).
    if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
      if(ENABLE_PRIVATE_TAGS)
 -      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic")
-+      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dcmtk/private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/private.dic")
      endif()
    else()
      set(DCM_DICT_DEFAULT_PATH "")
@@ -54,8 +54,8 @@ Author: Mathieu Malaterre <malat at debian.org>
 -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/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)
++install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${CMAKE_INSTALL_DATADIR} COMPONENT data)
++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIC} COMPONENT data)
  
  # add paths to the dictionaries to a CMake variable for being used by the unit tests
  set(DCMTK_DICOM_DICTIONARIES


=====================================
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/libdcmtk14 \
+ -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk14 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF \
  -DDCMTK_USE_CXX11_STL:BOOL=ON \
  -DDCMTK_ENABLE_CXX11:BOOL=ON



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/compare/5ea515d9ebd7e6026ba81c06597af659f9fbc500...8d4169a4adf4384dcdc5b3cc8948e138c5197907

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/compare/5ea515d9ebd7e6026ba81c06597af659f9fbc500...8d4169a4adf4384dcdc5b3cc8948e138c5197907
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/20190119/cf6d9e68/attachment-0001.html>