[neon/neon-packaging/kdsoap5/Neon/unstable] debian: make it a qt5 only single build
Carlos De Maine
null at kde.org
Wed Jul 26 12:52:01 BST 2023
Git commit b049408d1fb7c9a3332ab1de76ec87a5a1b2ee0f by Carlos De Maine.
Committed on 26/07/2023 at 13:45.
Pushed by carlosdem into branch 'Neon/unstable'.
make it a qt5 only single build
M +2 -3 debian/changelog
M +12 -33 debian/control
D +0 -7 debian/kdsoap6-dev.install
D +0 -12 debian/kdsoap6-doc.doc-base
D +0 -5 debian/kdsoap6-doc.install
D +0 -1 debian/kdsoap6-doc.links
D +0 -4 debian/kdsoap6-examples.examples
D +0 -2 debian/kdsoap6-server.install
D +0 -2 debian/kdsoap6.install
A +2 -0 debian/libkdsoap5-2.install
A +10 -0 debian/libkdsoap5-dev.install
A +2 -0 debian/libkdsoap5-server2.install
M +11 -9 debian/rules
M +4 -2 debian/watch
https://invent.kde.org/neon/neon-packaging/kdsoap5/-/commit/b049408d1fb7c9a3332ab1de76ec87a5a1b2ee0f
diff --git a/debian/changelog b/debian/changelog
index ae9ac75..37f8bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
-kdsoap6 (2.0.0-0neon) focal; urgency=medium
+kdsoap5 (2.1.1-0neon) jammy; urgency=medium
* New release
- -- Harald Sitter <sitter at kde.org> Mon, 05 Jul 2021 10:32:42 +0200
-
+ -- Carlos De Maine <carlosdemaine at gmail.com> Tue, 13 Jun 2023 18:54:14 +1000
diff --git a/debian/control b/debian/control
index 3f6d11f..e766b2a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,22 @@
-Source: kdsoap6
+Source: kdsoap5
Section: libs
Priority: optional
Maintainer: Thanh Tung Nguyen <thngtong at gmail.com>
Homepage: http://www.kdab.com/kd-soap/
-Standards-Version: 3.9.5
+Standards-Version: 4.6.2
Build-Depends: cmake,
debhelper-compat (= 13),
doxygen,
graphviz,
- kf6-extra-cmake-modules,
+ pkg-kde-tools,
+ qhelpgenerator-qt5,
+ qtbase5-dev,
qt6-base-dev,
- qt6-tools-dev,
quilt
Vcs-Git: git://github.com/KDAB/KDSoap.git
Vcs-Browser: https://github.com/KDAB/KDSoap
-Package: kdsoap6
+Package: libkdsoap5-2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
@@ -27,12 +28,12 @@ Description: Qt-based client-side and server-side SOAP component
.
This package contains the client-side library.
-Package: kdsoap6-dev
+Package: libkdsoap5-dev
Section: libdevel
Architecture: any
-Depends: kdsoap6-server (= ${binary:Version}),
- kdsoap6 (= ${binary:Version}),
- qt6-base-dev,
+Depends: libkdsoap5-server2 (= ${binary:Version}),
+ libkdsoap5-2 (= ${binary:Version}),
+ qtbase5-dev,
${misc:Depends},
${shlibs:Depends}
Description: Qt-based client-side and server-side SOAP component
@@ -43,33 +44,11 @@ Description: Qt-based client-side and server-side SOAP component
This package contains the static libraries and header files for development
with the KDSoap libraries.
-Package: kdsoap6-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: libjs-jquery, ${misc: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 documentation for the KDSoap libraries.
-
-Package: kdsoap6-examples
-Architecture: all
-Depends: ${misc: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 example programs.
-
-Package: kdsoap6-server
+Package: libkdsoap5-server2
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: kdsoap6 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libkdsoap5-2 (= ${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
diff --git a/debian/kdsoap6-dev.install b/debian/kdsoap6-dev.install
deleted file mode 100644
index 8f52ecb..0000000
--- a/debian/kdsoap6-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin
-usr/include
-usr/lib/*/cmake
-usr/lib/*/lib*.so
-usr/lib/*/qt6/mkspecs/modules/
-usr/share/doc/KDSoap-qt6/*.pri
-usr/share/mkspecs
diff --git a/debian/kdsoap6-doc.doc-base b/debian/kdsoap6-doc.doc-base
deleted file mode 100644
index 1de8097..0000000
--- a/debian/kdsoap6-doc.doc-base
+++ /dev/null
@@ -1,12 +0,0 @@
-Document: kdsoap
-Title: KDSoap Reference Manual
-Author: Klarälvdalens Datakonsult AB
-Abstract: KD Soap is a Qt-based client-side and server-side SOAP component.
- It 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.
-Section: Programming/C++
-
-Format: HTML
-Index: /usr/share/doc/libkdsoap-doc/html/index.html
-Files: /usr/share/doc/libkdsoap-doc/html/*.html
diff --git a/debian/kdsoap6-doc.install b/debian/kdsoap6-doc.install
deleted file mode 100644
index 453a206..0000000
--- a/debian/kdsoap6-doc.install
+++ /dev/null
@@ -1,5 +0,0 @@
-obj-*/docs/api/html usr/share/doc/libkdsoap-doc/
-usr/share/doc/KDSoap/LICENSES/
-usr/share/doc/KDSoap/README-commercial.txt
-usr/share/doc/KDSoap/README.txt
-usr/share/doc/KDSoap/kdsoap-api.qch
diff --git a/debian/kdsoap6-doc.links b/debian/kdsoap6-doc.links
deleted file mode 100644
index b39e399..0000000
--- a/debian/kdsoap6-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/javascript/jquery/jquery.js usr/share/doc/libkdsoap-doc/jquery.js
diff --git a/debian/kdsoap6-examples.examples b/debian/kdsoap6-examples.examples
deleted file mode 100644
index 5c5d907..0000000
--- a/debian/kdsoap6-examples.examples
+++ /dev/null
@@ -1,4 +0,0 @@
-examples/bank_gui
-examples/bank_wsdl
-examples/helloworld_client
-examples/helloworld_server
diff --git a/debian/kdsoap6-server.install b/debian/kdsoap6-server.install
deleted file mode 100644
index a9ae1f1..0000000
--- a/debian/kdsoap6-server.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkdsoap-server-qt6.so.2
-usr/lib/*/libkdsoap-server-qt6.so.2.*
diff --git a/debian/kdsoap6.install b/debian/kdsoap6.install
deleted file mode 100644
index 6ab81d6..0000000
--- a/debian/kdsoap6.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkdsoap-qt6.so.2
-usr/lib/*/libkdsoap-qt6.so.2.*
diff --git a/debian/libkdsoap5-2.install b/debian/libkdsoap5-2.install
new file mode 100644
index 0000000..138a8e5
--- /dev/null
+++ b/debian/libkdsoap5-2.install
@@ -0,0 +1,2 @@
+usr/lib/*/libkdsoap.so.2
+usr/lib/*/libkdsoap.so.2.*
diff --git a/debian/libkdsoap5-dev.install b/debian/libkdsoap5-dev.install
new file mode 100644
index 0000000..de1f082
--- /dev/null
+++ b/debian/libkdsoap5-dev.install
@@ -0,0 +1,10 @@
+usr/bin/kdwsdl2cpp
+usr/include/KDSoapServer/
+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/libkdsoap5-server2.install b/debian/libkdsoap5-server2.install
new file mode 100644
index 0000000..afba5ee
--- /dev/null
+++ b/debian/libkdsoap5-server2.install
@@ -0,0 +1,2 @@
+usr/lib/*/libkdsoap-server.so.2
+usr/lib/*/libkdsoap-server.so.2.*
diff --git a/debian/rules b/debian/rules
index f559cad..78d7af5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,15 @@
#!/usr/bin/make -f
-# SPDX-License-Identifier: LGPL-2.0-or-later
-# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
-%:
- dh $@ --with kf6 --buildsystem kf6 --parallel --with quilt
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-override_dh_auto_configure:
- dh_auto_configure -- -DKDSoap_DOCS=ON
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
+
+DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-override_dh_install:
- dh_install -plibkdsoap-doc -Xjquery.js
- dh_install --remaining-packages
+%:
+ dh $@ --with pkgkde_symbolshelper
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DKDSoap_DOCS=false -DKDSoap_TESTS=false -DKDSoap_EXAMPLES=false
diff --git a/debian/watch b/debian/watch
index 30e7671..d46db69 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,5 @@
version=4
-opts=pgpsigurlmangle=s/$/.asc/ \
- https://github.com/KDAB/KDSoap/releases .*/@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
+opts="searchmode=plain, \
+filenamemangle=s/.+\/kdsoap- at ANY_VERSION@\.tar\.gz/kdsoap-$1\.tar\.gz/" \
+https://api.github.com/repos/KDAB/KDSoap/releases \
+https://github.com/KDAB/KDSoap/releases/download/kdsoap-?\d[\.\d]*/kdsoap- at ANY_VERSION@.tar.gz
More information about the Neon-commits
mailing list