[neon/neon-packaging/kdsoap/Neon/unstable] debian: Revert "go back to old for now"

[Carlos De Maine]

Git commit 0dcd76d0e45e335314d77aa5201d497c3911c88d by Carlos De Maine.
Committed on 26/07/2023 at 09:42.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "go back to old for now"

This reverts commit 61158e37ce4874516a37fb69ce25d61a3a554838.

M  +15   -2    debian/control
M  +9    -6    debian/libkdsoap-dev.install
A  +7    -0    debian/libkdsoap-qt6-dev.install
A  +54   -0    debian/patches/dual_headers.diff
A  +1    -0    debian/patches/series

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

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..fd8704d 100644
--- a/debian/libkdsoap-dev.install
+++ b/debian/libkdsoap-dev.install
@@ -1,7 +1,10 @@
-usr/bin
-usr/include
-usr/lib/*/cmake
-usr/lib/*/lib*.so
-usr/lib/*/*/mkspecs/modules/
+usr/bin/kdwsdl2cpp
+usr/include/KDSoap/
+usr/include/KDSoapClient/
+usr/lib/*/cmake/KDSoap/
+usr/lib/*/libkdsoap.so
+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..72caed9
--- /dev/null
+++ b/debian/libkdsoap-qt6-dev.install
@@ -0,0 +1,7 @@
+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
+usr/lib/*/qt6/mkspecs/modules/
diff --git a/debian/patches/dual_headers.diff b/debian/patches/dual_headers.diff
new file mode 100644
index 0000000..311f340
--- /dev/null
+++ b/debian/patches/dual_headers.diff
@@ -0,0 +1,54 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 489af811..7c770f00 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -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}/KDSoapClient${${PROJECT_NAME}_LIBRARY_QTID}
++    )
+ 
+     configure_file(
+         "${CMAKE_CURRENT_SOURCE_DIR}/KDSoapConfig-buildtree.cmake.in"
+diff --git a/KDSoapConfig-buildtree.cmake.in b/KDSoapConfig-buildtree.cmake.in
+index 0bdf5fca..716ffb97 100644
+--- a/KDSoapConfig-buildtree.cmake.in
++++ b/KDSoapConfig-buildtree.cmake.in
+@@ -7,7 +7,7 @@
+ #
+ 
+ 
+-set(KDSoap_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR@")
++set(KDSoap_INCLUDE_DIRS "@INSTALL_INCLUDE_DIR@/KDSoap${${PROJECT_NAME}_LIBRARY_QTID}")
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/KDSoapTargets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/KDSoapMacros.cmake")
+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(
+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(
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..aeb33cf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dual_headers.diff