[neon/neon-packaging/kdsoap/Neon/unstable] debian: dual headers

[Carlos De Maine]

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

dual headers

M  +15   -2    debian/control
M  +6    -6    debian/libkdsoap-dev.install
A  +5    -0    debian/libkdsoap-qt6-dev.install
A  +45   -0    debian/patches/dual_headers.patch
A  +1    -0    debian/patches/series

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

diff --git a/debian/control b/debian/control
index 5e67312..2a10b09 100644
--- a/debian/control
+++ b/debian/control
@@ -44,10 +44,23 @@ Package: libkdsoap-dev
 Section: libdevel
 Architecture: any
 Depends: libkdsoap-server2 (= ${binary:Version}),
-         libkdsoap-server2-qt6 (= ${binary:Version}),
          libkdsoap2 (= ${binary:Version}),
-         libkdsoap2-qt6 (= ${binary:Version}),
          qtbase5-dev,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Qt-based client-side and server-side SOAP component
+ KDSoap can be used to create client applications for web services
+ and also provides the means to create web services without the need
+ for any further component such as a dedicated web server.
+ .
+ This package contains the static libraries and header files for development
+ with the KDSoap libraries.
+
+Package: libkdsoap-qt6-dev
+Section: libdevel
+Architecture: any
+Depends: libkdsoap-server2-qt6 (= ${binary:Version}),
+         libkdsoap2-qt6 (= ${binary:Version}),
          qt6-base-dev,
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/libkdsoap-dev.install b/debian/libkdsoap-dev.install
index 2dfda95..abd0ed9 100644
--- a/debian/libkdsoap-dev.install
+++ b/debian/libkdsoap-dev.install
@@ -1,7 +1,7 @@
-usr/bin
-usr/include
-usr/lib/*/cmake
-usr/lib/*/lib*.so
-usr/lib/*/*/mkspecs/modules/
+usr/bin/kdwsdl2cpp
+usr/include/KDSoap/
+usr/lib/*/cmake/KDSoap/
+usr/lib/*//libkdsoap-server.so
+usr/lib/*/qt5/mkspecs/modules/
 usr/share/doc/KDSoap/*.pri
-usr/share/mkspecs
+usr/share/mkspecs/
diff --git a/debian/libkdsoap-qt6-dev.install b/debian/libkdsoap-qt6-dev.install
new file mode 100644
index 0000000..95fa276
--- /dev/null
+++ b/debian/libkdsoap-qt6-dev.install
@@ -0,0 +1,5 @@
+usr/bin//kdwsdl2cpp-qt6
+usr/include/KDSoap-qt6/
+usr/lib/*/cmake/KDSoap-qt6/
+usr/lib/*/libkdsoap-server-qt6.so
+usr/lib/*/qt6/mkspecs/modules/
diff --git a/debian/patches/dual_headers.patch b/debian/patches/dual_headers.patch
new file mode 100644
index 0000000..774f177
--- /dev/null
+++ b/debian/patches/dual_headers.patch
@@ -0,0 +1,45 @@
+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
+
+---
+ src/KDSoapClient/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/KDSoapClient/CMakeLists.txt b/src/KDSoapClient/CMakeLists.txt
+index b81ed4ae..4ecbb1ef 100644
+--- a/src/KDSoapClient/CMakeLists.txt
++++ b/src/KDSoapClient/CMakeLists.txt
+@@ -107,7 +107,7 @@ if(KDSoap_IS_ROOT_PROJECT)
+               KDSoapEndpointReference.h
+               KDQName.h
+               KDSoapUdpClient.h
+-        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
+
+---
+ src/KDSoapServer/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/KDSoapServer/CMakeLists.txt b/src/KDSoapServer/CMakeLists.txt
+index a4a0e812..2e145b02 100644
+--- a/src/KDSoapServer/CMakeLists.txt
++++ b/src/KDSoapServer/CMakeLists.txt
+@@ -88,7 +88,7 @@ if(KDSoap_IS_ROOT_PROJECT)
+               KDSoapServerObjectInterface.h
+               KDSoapServerGlobal.h
+               KDSoapThreadPool.h
+-        DESTINATION ${INSTALL_INCLUDE_DIR}/KDSoapServer
++        DESTINATION "${INSTALL_INCLUDE_DIR}/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}/KDSoapServer"
+     )
+
+     install(
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a3d1572
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dual_headers.patch