[neon/neon-packaging/kdsoap/Neon/unstable] debian: make it a qt6 only single package

Carlos De Maine null at kde.org
Wed Jul 26 12:36:06 BST 2023


Git commit fc65daad8ae9ee897bd154ec9354a3456aaee02a by Carlos De Maine.
Committed on 26/07/2023 at 13:36.
Pushed by carlosdem into branch 'Neon/unstable'.

make it a qt6 only single package

M  +0    -42   debian/control
D  +0    -10   debian/libkdsoap-dev.install
M  +2    -2    debian/libkdsoap-qt6-dev.install
D  +0    -2    debian/libkdsoap-server2.install
D  +0    -2    debian/libkdsoap2.install
D  +0    -54   debian/patches/dual_headers.diff
D  +0    -1    debian/patches/series
M  +1    -12   debian/rules

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

diff --git a/debian/control b/debian/control
index 2a10b09..efb689e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,25 +9,11 @@ Build-Depends: cmake,
                doxygen,
                graphviz,
                pkg-kde-tools,
-               qhelpgenerator-qt5,
-               qtbase5-dev,
                qt6-base-dev,
                quilt
 Vcs-Git: git://github.com/KDAB/KDSoap.git
 Vcs-Browser: https://github.com/KDAB/KDSoap
 
-Package: libkdsoap2
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${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 client-side library.
-
 Package: libkdsoap2-qt6
 Architecture: any
 Multi-Arch: same
@@ -40,22 +26,6 @@ Description: Qt6-based client-side and server-side SOAP component
  .
  This package contains the Qt6 client-side library.
 
-Package: libkdsoap-dev
-Section: libdevel
-Architecture: any
-Depends: libkdsoap-server2 (= ${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
@@ -94,18 +64,6 @@ Description: Qt-based client-side and server-side SOAP component
  .
  This package contains example programs.
 
-Package: libkdsoap-server2
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libkdsoap2 (= ${binary:Version}), ${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 server-side library.
-
 Package: libkdsoap-server2-qt6
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libkdsoap-dev.install b/debian/libkdsoap-dev.install
deleted file mode 100644
index fd8704d..0000000
--- a/debian/libkdsoap-dev.install
+++ /dev/null
@@ -1,10 +0,0 @@
-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/
-
diff --git a/debian/libkdsoap-qt6-dev.install b/debian/libkdsoap-qt6-dev.install
index 72caed9..0f35bae 100644
--- a/debian/libkdsoap-qt6-dev.install
+++ b/debian/libkdsoap-qt6-dev.install
@@ -1,6 +1,6 @@
 usr/bin/kdwsdl2cpp-qt6
-usr/include/KDSoap-qt6/
-usr/include/KDSoapClient-qt6/
+usr/include/KDSoapServer/
+usr/include/KDSoapClient/
 usr/lib/*/cmake/KDSoap-qt6/
 usr/lib/*/libkdsoap-qt6.so
 usr/lib/*/libkdsoap-server-qt6.so
diff --git a/debian/libkdsoap-server2.install b/debian/libkdsoap-server2.install
deleted file mode 100644
index afba5ee..0000000
--- a/debian/libkdsoap-server2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkdsoap-server.so.2
-usr/lib/*/libkdsoap-server.so.2.*
diff --git a/debian/libkdsoap2.install b/debian/libkdsoap2.install
deleted file mode 100644
index 138a8e5..0000000
--- a/debian/libkdsoap2.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkdsoap.so.2
-usr/lib/*/libkdsoap.so.2.*
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
diff --git a/debian/rules b/debian/rules
index 6bc2630..4ba15d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,17 +15,6 @@ DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 #	dh_install -plibkdsoap-doc -Xjquery.js
 #	dh_install --remaining-packages
 
-execute_after_dh_auto_clean:
-	rm -rf build-qt6
-
 override_dh_auto_configure:
-	dh_auto_configure -- -DKDSoap_DOCS=ON -DKDSoap_TESTS=false
-	dh_auto_configure --builddirectory=build-qt6 -- -DKDSoap_DOCS=ON -DKDSoap_TESTS=false -DKDSoap_QT6=true -DKDSoap_EXAMPLES=false
-
-override_dh_auto_build:
-	dh_auto_build
-	dh_auto_build --builddirectory=build-qt6
+	dh_auto_configure -- -DKDSoap_DOCS=ON -DKDSoap_TESTS=false -DKDSoap_QT6=true -DKDSoap_EXAMPLES=true
 
-override_dh_auto_install:
-	dh_auto_install
-	dh_auto_install --builddirectory=build-qt6


More information about the Neon-commits mailing list