[neon/neon-packaging/kdsoap/Neon/release-lts] debian: New release

[Harald Sitter]

Git commit ecb671917be248b298d9bc2fb019f25ac92fe92c by Harald Sitter.
Committed on 05/07/2021 at 10:58.
Pushed by sitter into branch 'Neon/release-lts'.

New release

- so names bumped to 2
- docs are now built through a cmake switch (but html not installed :()
- install new qch docs
- remove manual docs handling in rules file
- update doc install rule accordingly

M  +6    -0    debian/changelog
M  +5    -5    debian/control
M  +2    -1    debian/libkdsoap-doc.install
D  +0    -1    debian/libkdsoap-server1.install
D  +0    -2    debian/libkdsoap1.install
M  +1    -10   debian/rules

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

diff --git a/debian/changelog b/debian/changelog
index 020fc95..cdeb801 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kdsoap (2.0.0-0neon) focal; urgency=medium
+
+  * New release
+
+ -- Harald Sitter <sitter at kde.org>  Mon, 05 Jul 2021 10:32:42 +0200
+
 kdsoap (1.10.0-0neon) focal; urgency=medium
 
   * New release
diff --git a/debian/control b/debian/control
index cfd57b3..031b13e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: cmake (>= 2.8.9),
 Vcs-Git: git://github.com/KDAB/KDSoap.git
 Vcs-Browser: https://github.com/KDAB/KDSoap
 
-Package: libkdsoap1
+Package: libkdsoap2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -28,8 +28,8 @@ Description: Qt-based client-side and server-side SOAP component
 Package: libkdsoap-dev
 Section: libdevel
 Architecture: any
-Depends: libkdsoap-server1 (= ${binary:Version}),
-         libkdsoap1 (= ${binary:Version}),
+Depends: libkdsoap-server2 (= ${binary:Version}),
+         libkdsoap2 (= ${binary:Version}),
          qtbase5-dev,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -63,11 +63,11 @@ Description: Qt-based client-side and server-side SOAP component
  .
  This package contains example programs.
 
-Package: libkdsoap-server1
+Package: libkdsoap-server2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libkdsoap1 (= ${binary:Version}), ${misc:Depends}, ${shlibs: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
diff --git a/debian/libkdsoap-doc.install b/debian/libkdsoap-doc.install
index 7be7ebe..453a206 100644
--- a/debian/libkdsoap-doc.install
+++ b/debian/libkdsoap-doc.install
@@ -1,4 +1,5 @@
-doc/refman/* usr/share/doc/libkdsoap-doc/html
+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/libkdsoap-server1.install b/debian/libkdsoap-server1.install
deleted file mode 100644
index cb634d2..0000000
--- a/debian/libkdsoap-server1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libkdsoap-server.so.*
diff --git a/debian/libkdsoap1.install b/debian/libkdsoap1.install
deleted file mode 100644
index 9716c15..0000000
--- a/debian/libkdsoap1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libkdsoap.so.1
-usr/lib/*/libkdsoap.so.1.*
diff --git a/debian/rules b/debian/rules
index 3632085..e77711e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,17 +11,8 @@ DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 %:
 	dh $@ --parallel --with quilt
 
-override_dh_auto_clean:
-	rm -rf doc/latex doc/refman
-	rm -f doxygen.log kdsoap.log kdsoap.tag
-	dh_auto_clean
-
 override_dh_auto_configure:
-	dh_auto_configure
-
-override_dh_auto_build:
-	doxygen Doxyfile
-	dh_auto_build
+	dh_auto_configure -- -DKDSoap_DOCS=ON
 
 override_dh_install:
 	dh_install -plibkdsoap-doc -Xjquery.js