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

[Carlos De Maine]

Git commit 61158e37ce4874516a37fb69ce25d61a3a554838 by Carlos De Maine.
Committed on 19/07/2023 at 02:28.
Pushed by carlosdem into branch 'Neon/unstable'.

go back to old for now

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

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

diff --git a/debian/control b/debian/control
index 2a10b09..5e67312 100644
--- a/debian/control
+++ b/debian/control
@@ -44,23 +44,10 @@ Package: libkdsoap-dev
 Section: libdevel
 Architecture: any
 Depends: libkdsoap-server2 (= ${binary:Version}),
+         libkdsoap-server2-qt6 (= ${binary:Version}),
          libkdsoap2 (= ${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}),
+         qtbase5-dev,
          qt6-base-dev,
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/libkdsoap-dev.install b/debian/libkdsoap-dev.install
index fd8704d..2dfda95 100644
--- a/debian/libkdsoap-dev.install
+++ b/debian/libkdsoap-dev.install
@@ -1,10 +1,7 @@
-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/bin
+usr/include
+usr/lib/*/cmake
+usr/lib/*/lib*.so
+usr/lib/*/*/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
deleted file mode 100644
index 72caed9..0000000
--- a/debian/libkdsoap-qt6-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 311f340..0000000
--- a/debian/patches/dual_headers.diff
+++ /dev/null
@@ -1,54 +0,0 @@
-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
deleted file mode 100644
index aeb33cf..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dual_headers.diff