d/patches: Fix install path for docs

diff --git a/debian/dcmtk-doc.doc-base b/debian/dcmtk-doc.doc-base
index eb33f9e611af790f977df0066cfa29ac8ac08f2f..761ca1fcaa0d6e9469107643838e9917693ed3be 100644 (file)
--- a/debian/dcmtk-doc.doc-base
+++ b/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/*

diff --git a/debian/dcmtk-doc.docs b/debian/dcmtk-doc.docs
index 470bae5f3af52d8f0d8dcd65a971361955bf8e3e..9c1434e790ebaa3c946debdfeac8a659bb2f60a6 100644 (file)
--- a/debian/dcmtk-doc.docs
+++ b/debian/dcmtk-doc.docs
@@ -1 +1 @@
-usr/share/doc/dcmtk/
+usr/share/doc/dcmtk-*/

diff --git a/debian/patches/remove_version.patch b/debian/patches/remove_version.patch
index 033fced937bf21b1c56d0f2c507a4e66dc0fafd5..f306239bd7ff71b4405e01a9a4d2d478aea7daa0 100644 (file)
--- a/debian/patches/remove_version.patch
+++ b/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}/")