[neon/neon-packaging/kdsoap/Neon/unstable] debian: again

[Carlos De Maine]

Git commit 3a66ae61555d455dff3576f5ed0c65d32e5378a4 by Carlos De Maine.
Committed on 17/07/2023 at 04:18.
Pushed by carlosdem into branch 'Neon/unstable'.

again

M  +1    -0    debian/libkdsoap-dev.install
M  +1    -0    debian/libkdsoap-qt6-dev.install
M  +5    -3    debian/patches/dual_headers.diff

https://invent.kde.org/neon/neon-packaging/kdsoap/-/commit/3a66ae61555d455dff3576f5ed0c65d32e5378a4

diff --git a/debian/libkdsoap-dev.install b/debian/libkdsoap-dev.install
index 5966910..fd8704d 100644
--- a/debian/libkdsoap-dev.install
+++ b/debian/libkdsoap-dev.install
@@ -1,5 +1,6 @@
 usr/bin/kdwsdl2cpp
 usr/include/KDSoap/
+usr/include/KDSoapClient/
 usr/lib/*/cmake/KDSoap/
 usr/lib/*/libkdsoap.so
 usr/lib/*/libkdsoap-server.so
diff --git a/debian/libkdsoap-qt6-dev.install b/debian/libkdsoap-qt6-dev.install
index 3df2da4..72caed9 100644
--- a/debian/libkdsoap-qt6-dev.install
+++ b/debian/libkdsoap-qt6-dev.install
@@ -1,5 +1,6 @@
 usr/bin/kdwsdl2cpp-qt6
 usr/include/KDSoap-qt6/
+usr/include/KDSoapClient-qt6/
 usr/lib/*/cmake/KDSoap-qt6/
 usr/lib/*/libkdsoap-qt6.so
 usr/lib/*/libkdsoap-server-qt6.so
diff --git a/debian/patches/dual_headers.diff b/debian/patches/dual_headers.diff
index 174f258..311f340 100644
--- a/debian/patches/dual_headers.diff
+++ b/debian/patches/dual_headers.diff
@@ -1,13 +1,15 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 489af811..22efb0cc 100644
+index 489af811..7c770f00 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -207,7 +207,7 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
+@@ -207,7 +207,9 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
          COMPATIBILITY
          AnyNewerVersion
      )
 -    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h" DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient)
-+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h" DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapClient")
++    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdsoap_version.h"
++            DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient${${PROJECT_NAME}_LIBRARY_QTID}
++    )
  
      configure_file(
          "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"