[neon/neon-packaging/kdsoap/Neon/unstable] debian: update installs and patch

[Carlos De Maine]

Git commit ea40a44c698151f59e947ed67541f0c752855810 by Carlos De Maine.
Committed on 14/07/2023 at 13:49.
Pushed by carlosdem into branch 'Neon/unstable'.

update installs and patch

M  +2    -1    debian/libkdsoap-dev.install
M  +2    -2    debian/libkdsoap-qt6-dev.install
M  +27   -4    debian/patches/dual_headers.patch

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

diff --git a/debian/libkdsoap-dev.install b/debian/libkdsoap-dev.install
index abd0ed9..3d41d96 100644
--- a/debian/libkdsoap-dev.install
+++ b/debian/libkdsoap-dev.install
@@ -1,7 +1,8 @@
 usr/bin/kdwsdl2cpp
 usr/include/KDSoap/
 usr/lib/*/cmake/KDSoap/
-usr/lib/*//libkdsoap-server.so
+usr/lib/*/libkdsoap.so
 usr/lib/*/qt5/mkspecs/modules/
 usr/share/doc/KDSoap/*.pri
 usr/share/mkspecs/
+
diff --git a/debian/libkdsoap-qt6-dev.install b/debian/libkdsoap-qt6-dev.install
index 95fa276..1fd9812 100644
--- a/debian/libkdsoap-qt6-dev.install
+++ b/debian/libkdsoap-qt6-dev.install
@@ -1,5 +1,5 @@
-usr/bin//kdwsdl2cpp-qt6
+usr/bin/kdwsdl2cpp-qt6
 usr/include/KDSoap-qt6/
 usr/lib/*/cmake/KDSoap-qt6/
-usr/lib/*/libkdsoap-server-qt6.so
+usr/lib/*/libkdsoap-qt6.so
 usr/lib/*/qt6/mkspecs/modules/
diff --git a/debian/patches/dual_headers.patch b/debian/patches/dual_headers.patch
index 774f177..2bd96b5 100644
--- a/debian/patches/dual_headers.patch
+++ b/debian/patches/dual_headers.patch
@@ -1,7 +1,7 @@
 From 0b9e9a4ef46895c5fcaf1685ea330c2fc38f0e49 Mon Sep 17 00:00:00 2001
 From: carlosd <60242467+carlosdem at users.noreply.github.com>
 Date: Fri, 14 Jul 2023 23:22:58 +1000
-Subject: [PATCH 1/2] allow dual headers
+Subject: [PATCH 1/3] allow dual headers
 
 ---
  src/KDSoapClient/CMakeLists.txt | 2 +-
@@ -18,13 +18,13 @@ index b81ed4ae..4ecbb1ef 100644
 -        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapClient
 +        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapClient"
      )
-
+ 
      install(
 
 From 4df6c29bf97337d6ae54cbe8b07433571851e42f Mon Sep 17 00:00:00 2001
 From: carlosd <60242467+carlosdem at users.noreply.github.com>
 Date: Fri, 14 Jul 2023 23:23:36 +1000
-Subject: [PATCH 2/2] allow dual headers
+Subject: [PATCH 2/3] allow dual headers
 
 ---
  src/KDSoapServer/CMakeLists.txt | 2 +-
@@ -41,5 +41,28 @@ index a4a0e812..2e145b02 100644
 -        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapServer
 +        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapServer"
      )
-
+ 
      install(
+
+From 4f44b6cad5b49e47fb224746ec21f92af3c20e4d Mon Sep 17 00:00:00 2001
+From: carlosd <60242467+carlosdem at users.noreply.github.com>
+Date: Fri, 14 Jul 2023 23:47:58 +1000
+Subject: [PATCH 3/3] allow dual headers
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 489af811..c029891c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -207,7 +207,7 @@ 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)
+ 
+     configure_file(
+         "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
\ No newline at end of file