[med-svn] [Git][med-team/dcmtk][master] 4 commits: Adapt patch and exclude patches applied upstream

Andreas Tille (@tille) gitlab at salsa.debian.org
Tue May 3 09:03:55 BST 2022 


Andreas Tille pushed to branch master at Debian Med / dcmtk


Commits:
fe88d255 by Andreas Tille at 2022-05-03T09:33:52+02:00
Adapt patch and exclude patches applied upstream

- - - - -
52063458 by Andreas Tille at 2022-05-03T09:34:30+02:00
Drop debian/gbp.conf

- - - - -
560218d0 by Andreas Tille at 2022-05-03T09:35:32+02:00
Install pkgconfig file

- - - - -
e106c91f by Andreas Tille at 2022-05-03T10:02:56+02:00
Review d/copyright

- - - - -


6 changed files:

- debian/changelog
- debian/copyright
- − debian/gbp.conf
- debian/libdcmtk-dev.install
- debian/patches/03_datadic_install.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -7,7 +7,9 @@ dcmtk (3.6.7-1) UNRELEASED; urgency=medium
   * Drop useless get-orig-source target (routine-update)
   * Remove trailing whitespace in debian/changelog (routine-update)
   * Remove trailing whitespace in debian/rules (routine-update)
-  TODO: Refresh patches
+  * Drop debian/gbp.conf
+  * Install pkgconfig file
+  * Review d/copyright
 
  -- Andreas Tille <tille at debian.org>  Mon, 02 May 2022 15:51:57 +0200
 


=====================================
debian/copyright
=====================================
@@ -69,7 +69,7 @@ License: OFFIS
  include the three paragraphs of this copyright notice.
 
 Files: dcmnet/include/dcmtk/dcmnet/dul.h
-       dcmnet/libsrc/dulstruc.h
+       dcmnet/include/dcmtk/dcmnet/dulstruc.h
        dcmnet/libsrc/dul.cc
        dcmnet/libsrc/dulconst.cc
        dcmnet/libsrc/dulpriv.h
@@ -77,10 +77,11 @@ Files: dcmnet/include/dcmtk/dcmnet/dul.h
        dcmnet/libsrc/dulfsm.h
        dcmnet/libsrc/dulfsm.cc
        dcmnet/libsrc/dulparse.cc
-Copyright: 1993, RSNA and Washington University
+Copyright: 1993, 1994 RSNA and Washington University
+           1994-2021, OFFIS e.V.
 License: RSNA
  The software and supporting documentation for the Radiological
- Society of North America (RSNA) 1993 Digital Imaging and
+ Society of North America (RSNA) 1993, 1994 Digital Imaging and
  Communications in Medicine (DICOM) Demonstration were developed
  at the
          Electronic Radiology Laboratory
@@ -384,21 +385,20 @@ License: dcmtk-or-AFPL
 
 Files: dcmrt/*
 Copyright: 2008-2012, OFFIS e.V. and ICSMED AG, Oldenburg, Germany
-           2013-2017, J. Riesmeier, Oldenburg, Germany
+           2013-2021, J. Riesmeier, Oldenburg, Germany
 License: BSD-3-clause-Riesmeier
 
 Files: dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
  dcmsr/include/dcmtk/dcmsr/dsrsaecc.h
  dcmsr/libsrc/dsrdncsr.cc
  dcmsr/libsrc/dsrsaecc.cc
- dcmsr/include/dcmtk/dcmsr/cmr/tid1409m.h
  dcmsr/include/dcmtk/dcmsr/cmr/tid1419m.h
  dcmsr/include/dcmtk/dcmsr/cmr/tid1501.h
  dcmsr/include/dcmtk/dcmsr/cmr/tid15def.h
  dcmsr/include/dcmtk/dcmsr/cmr/tid300.h
- dcmsr/include/dcmtk/dcmsr/cmr/dsrdnflt.h
- dcmsr/include/dcmtk/dcmsr/cmr/dsritcsr.h
- dcmsr/include/dcmtk/dcmsr/cmr/dsrprdcc.h
+ dcmsr/include/dcmtk/dcmsr/dsrdnflt.h
+ dcmsr/include/dcmtk/dcmsr/dsritcsr.h
+ dcmsr/include/dcmtk/dcmsr/dsrprdcc.h
  dcmsr/include/dcmtk/dcmsr/dsrpficc.h
  dcmsr/libsrc/dsrpficc.cc
  dcmsr/libsrc/dsrplicc.cc
@@ -407,10 +407,10 @@ Files: dcmsr/include/dcmtk/dcmsr/dsrdncsr.h
  dcmsr/libcmr/tid1501.cc
  dcmsr/libcmr/tid15def.cc
  dcmsr/libcmr/tid300cc.cc
- dcmsr/libcmr/dsrdnflt.cc
- dcmsr/libcmr/dsritcsr.cc
- dcmsr/libcmr/dsrprdcc.cc
-Copyright: 2016-2017, J. Riesmeier, Oldenburg, Germany
+ dcmsr/libsrc/dsrdnflt.cc
+ dcmsr/libsrc/dsritcsr.cc
+ dcmsr/libsrc/dsrprdcc.cc
+Copyright: 2016-2021, J. Riesmeier, Oldenburg, Germany
 License: OFFISeV
 
 Files: dcmect/include/dcmtk/dcmect/def.h


=====================================
debian/gbp.conf deleted
=====================================
@@ -1,3 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-


=====================================
debian/libdcmtk-dev.install
=====================================
@@ -1,3 +1,4 @@
 usr/include/dcmtk/*
 usr/lib/*/*.so
 usr/lib/*/cmake/
+usr/lib/*/pkgconfig
\ No newline at end of file


=====================================
debian/patches/03_datadic_install.patch
=====================================
@@ -2,57 +2,61 @@ Description: Install dict to versioned dir
 Bug-Debian: https://bugs.debian.org/709123
 Forwarded: no
 Author: Mathieu Malaterre <malat at debian.org>
-Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
-===================================================================
---- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
-+++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
-@@ -114,15 +114,7 @@ endif()
- #endif()
+--- a/CMake/GenerateDCMTKConfigure.cmake
++++ b/CMake/GenerateDCMTKConfigure.cmake
+@@ -118,23 +118,8 @@ endif()
  
  # Configure file
--
+ 
 -# Windows being windows, it lies about its processor type to 32 bit binaries
 -set(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
 -if(NOT SYSTEM_PROCESSOR)
--  set(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+-  if(WIN32 AND NOT CYGWIN)
+-    if(CMAKE_GENERATOR_PLATFORM)
+-      set(SYSTEM_PROCESSOR "${CMAKE_GENERATOR_PLATFORM}")
+-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-      set(SYSTEM_PROCESSOR "x64")
+-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-      set(SYSTEM_PROCESSOR "Win32")
+-    endif()
+-  else()
+-    set(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+-  endif()
 -endif()
--# CMake doesn't provide a configure-style system type string
+ # CMake doesn't provide a configure-style system type string
 -set(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
--DCMTK_UNSET(SYSTEM_PROCESSOR)
 +set(CANONICAL_HOST_TYPE "Debian")
+ DCMTK_UNSET(SYSTEM_PROCESSOR)
  
  # Configure dictionary path and install prefix
- if(WIN32 AND NOT CYGWIN)
-@@ -134,10 +126,10 @@ if(WIN32 AND NOT CYGWIN)
+@@ -147,10 +132,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)
+   if(DCMTK_DEFAULT_DICT STREQUAL "external")
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\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}\\\\private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\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}")
-@@ -155,10 +147,10 @@ else()
+@@ -168,10 +153,10 @@ else()
    set(ENVIRONMENT_PATH_SEPARATOR ":")
    # Set dictionary path to the data dir inside install main dir (prefix).
-   if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+   if(DCMTK_DEFAULT_DICT STREQUAL "external")
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/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}/private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/private.dic")
      endif()
    else()
      set(DCM_DICT_DEFAULT_PATH "")
-Index: dcmtk/dcmdata/data/CMakeLists.txt
-===================================================================
---- dcmtk.orig/dcmdata/data/CMakeLists.txt
-+++ dcmtk/dcmdata/data/CMakeLists.txt
+--- a/dcmdata/data/CMakeLists.txt
++++ b/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)


=====================================
debian/patches/series
=====================================
@@ -1,10 +1,10 @@
 01_dcmtk_3.6.0-1.patch
 03_datadic_install.patch
 07_dont_export_all_executables.patch
-bigendian.patch
-bug1000220.patch
-test_failures.patch
-3ae202ee9d8f27054ad0c463a6799d8b10b4864b.patch
-0cf6b12d8ea0b727f0fe2ab076b6f180100fbd30.patch
-ab61e8577ff0974efcfae2907c48baf6023c1160.patch
-1c8cca4bf6f7c92fc16f9e66faf49409c891a2b0.patch
+#bigendian.patch
+#bug1000220.patch
+#test_failures.patch
+#3ae202ee9d8f27054ad0c463a6799d8b10b4864b.patch
+#0cf6b12d8ea0b727f0fe2ab076b6f180100fbd30.patch
+#ab61e8577ff0974efcfae2907c48baf6023c1160.patch
+#1c8cca4bf6f7c92fc16f9e66faf49409c891a2b0.patch



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/d5aa8b70f92ea0dcd953f05a570858369dbc922d...e106c91f82d292cc088809af46e501fda7049a04

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/d5aa8b70f92ea0dcd953f05a570858369dbc922d...e106c91f82d292cc088809af46e501fda7049a04
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/20220503/c7afdeaf/attachment-0001.htm>

More information about the debian-med-commit mailing list