[med-svn] [Git][med-team/dcmtk][debian/experimental] 2 commits: d/patches: Fix install path for docs

[Mathieu Malaterre (@malat)]

Mathieu Malaterre pushed to branch debian/experimental at Debian Med / dcmtk


Commits:
2318cc44 by Mathieu Malaterre at 2023-11-06T12:04:04+01:00
d/patches: Fix install path for docs

- - - - -
0ea5fd8d by Mathieu Malaterre at 2023-11-06T12:07:55+01:00
d/changelog: Upload 3.6.8~git20231027.1549d8c-2 to experimental

- - - - -


4 changed files:

- debian/changelog
- debian/dcmtk-doc.doc-base
- debian/dcmtk-doc.docs
- debian/patches/remove_version.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+dcmtk (3.6.8~git20231027.1549d8c-2) experimental; urgency=medium
+
+  * d/patches: Fix install path for docs
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 06 Nov 2023 12:07:47 +0100
+
 dcmtk (3.6.8~git20231027.1549d8c-1) experimental; urgency=medium
 
   * New upstream version 3.6.8~git20231027.1549d8c


=====================================
debian/dcmtk-doc.doc-base
=====================================
@@ -8,5 +8,5 @@ Abstract:  This manual comprises the complete on-line documentation for the
 Section: Science/Medicine
 
 Format: HTML
-Index: /usr/share/doc/dcmtk/dcmtk/html/index.html
-Files: /usr/share/doc/dcmtk/dcmtk/html/*
+Index: /usr/share/doc/dcmtk/dcmtk-3.6.8/html/index.html
+Files: /usr/share/doc/dcmtk/dcmtk-3.6.8/html/*


=====================================
debian/dcmtk-doc.docs
=====================================
@@ -1 +1 @@
-usr/share/doc/dcmtk/
+usr/share/doc/dcmtk-*/


=====================================
debian/patches/remove_version.patch
=====================================
@@ -7,16 +7,14 @@ Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
 ===================================================================
 --- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
 +++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
-@@ -180,9 +180,9 @@ else()
+@@ -180,8 +180,8 @@ else()
  
    # Modify the installation paths for configuration files, data files and documents
    # by adding a subdirectory with the DCMTK name and version number
 -  set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
 -  set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
--  set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
 +  set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk")
 +  set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk")
-+  set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}")
+   set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
  
    # These variables are defined as macros in osconfig.h and must end with a path separator
-   set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/")



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/65eb9aabe6d249c6dcf34842d5ab6766caf46934...0ea5fd8da1ae341de09c6d3b7e52756412d8ee0a

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/65eb9aabe6d249c6dcf34842d5ab6766caf46934...0ea5fd8da1ae341de09c6d3b7e52756412d8ee0a
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/20231106/d80b92be/attachment-0001.htm>