[med-svn] [Git][med-team/dcmtk][master] d/patches: Properly install dcm2xml.dtd/dumppat.txt. Closes: #993025

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch master at Debian Med / dcmtk


Commits:
4432adce by Mathieu Malaterre at 2021-11-05T09:01:47+01:00
d/patches: Properly install dcm2xml.dtd/dumppat.txt. Closes: #993025

- - - - -


4 changed files:

- debian/dcmtk.install
- debian/patches/03_datadic_install.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/dcmtk.install
=====================================
@@ -3,3 +3,5 @@ etc/dcmtk/*
 usr/share/dcmtk/*.css
 usr/share/dcmtk/*.lut
 usr/share/dcmtk/dsr2xml.xsd
+usr/share/dcmtk/dcm2xml.dtd
+usr/share/dcmtk/dumppat.txt


=====================================
debian/patches/03_datadic_install.patch
=====================================
@@ -2,9 +2,11 @@ Description: Install dict to versioned dir
 Bug-Debian: https://bugs.debian.org/709123
 Forwarded: no
 Author: Mathieu Malaterre <malat at debian.org>
---- a/CMake/GenerateDCMTKConfigure.cmake
-+++ b/CMake/GenerateDCMTKConfigure.cmake
-@@ -114,15 +114,7 @@
+Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
+===================================================================
+--- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
++++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
+@@ -114,15 +114,7 @@ endif()
  #endif()
  
  # Configure file
@@ -21,7 +23,7 @@ Author: Mathieu Malaterre <malat at debian.org>
  
  # Configure dictionary path and install prefix
  if(WIN32 AND NOT CYGWIN)
-@@ -134,10 +126,10 @@
+@@ -134,10 +126,10 @@ if(WIN32 AND NOT CYGWIN)
    set(ENVIRONMENT_PATH_SEPARATOR ";")
    # Set dictionary path to the data dir inside install main dir (prefix)
    if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
@@ -34,7 +36,7 @@ Author: Mathieu Malaterre <malat at debian.org>
      endif()
       # Again, for Windows strip all / from path and replace it with \\.
      string(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
-@@ -155,10 +147,10 @@
+@@ -155,10 +147,10 @@ else()
    set(ENVIRONMENT_PATH_SEPARATOR ":")
    # Set dictionary path to the data dir inside install main dir (prefix).
    if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
@@ -47,14 +49,16 @@ Author: Mathieu Malaterre <malat at debian.org>
      endif()
    else()
      set(DCM_DICT_DEFAULT_PATH "")
---- a/dcmdata/data/CMakeLists.txt
-+++ b/dcmdata/data/CMakeLists.txt
+Index: dcmtk/dcmdata/data/CMakeLists.txt
+===================================================================
+--- dcmtk.orig/dcmdata/data/CMakeLists.txt
++++ dcmtk/dcmdata/data/CMakeLists.txt
 @@ -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/libdcmtk${DCMTK_ABI_VERSION}")
 +
-+install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${CMAKE_INSTALL_DATADIR} COMPONENT data)
++install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" 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


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,3 @@
 01_dcmtk_3.6.0-1.patch
 03_datadic_install.patch
 07_dont_export_all_executables.patch
-


=====================================
debian/rules
=====================================
@@ -80,10 +80,8 @@ override_dh_install-arch:
 	rm ./debian/dcmtk/usr/bin/mkreport
 	rm ./debian/dcmtk/usr/bin/msgserv
 	rm ./debian/dcmtk/usr/bin/wltest
-	rm ./debian/tmp/usr/share/SC.dump
-	rm ./debian/tmp/usr/share/VLP.dump
-	rm ./debian/tmp/usr/share/dcm2xml.dtd
-	rm ./debian/tmp/usr/share/dumppat.txt
+	rm ./debian/tmp/usr/share/dcmtk/SC.dump
+	rm ./debian/tmp/usr/share/dcmtk/VLP.dump
 
 get-orig-source:
 	uscan --force-download --verbose --rename



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/commit/4432adce58b7f9bf9816d434d59dbc60b4207ea3

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/commit/4432adce58b7f9bf9816d434d59dbc60b4207ea3
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/20211105/a0434f8f/attachment-0001.htm>