[neon/kde/libkgapi/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit 913e6eae51a62ff3e22db819724804ffb310c06c by Carlos De Maine.
Committed on 24/09/2023 at 08:06.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +4    -8    debian/control
M  +0    -1    debian/copyright
M  +1    -1    debian/kf6-kpimgapi-dev.install
M  +2    -2    debian/kf6-kpimgapi.install
M  +2    -6    debian/rules

https://invent.kde.org/neon/kde/libkgapi/-/commit/913e6eae51a62ff3e22db819724804ffb310c06c

diff --git a/debian/control b/debian/control
index 8e54500..1be7712 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: cmake (>= 3.0~),
                qt6-tools-dev,
                qt6-webengine-dev,
                xauth,
-               xvfb,
+               xvfb
 Standards-Version: 4.3.0
 Homepage: https://projects.kde.org/libkgapi
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkgapi.git
@@ -33,7 +33,7 @@ Depends: kf6-calendarcore-dev,
          kf6-contacts-dev,
          kf6-kpimgapi,
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: Google API library for KDE -- development files
  LibKGAPI (previously called LibKGoogle) is a C++ library that implements APIs
  for various Google services.
@@ -44,18 +44,14 @@ Description: Google API library for KDE -- development files
 Package: kf6-kpimgapi
 Architecture: any
 Multi-Arch: same
-Depends: qt6-webengine,
-         ${misc:Depends},
-         ${shlibs:Depends},
+Depends: qt6-webengine, ${misc:Depends}, ${shlibs:Depends}
 Description: core library to integrate with Google service APIs
  This package is part of libkgapi.
 
 Package: libsasl2-modules-kdexoauth2
 Architecture: any
 Multi-Arch: same
-Depends: kf6-kpimgapi (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
+Depends: kf6-kpimgapi (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: kdepim-runtime (<< 4:18.04.9)
 Replaces: kdepim-runtime (<< 4:18.04.9)
 Description: library to integrate with Cyrus SASL
diff --git a/debian/copyright b/debian/copyright
index d7e8366..8b63685 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -123,4 +123,3 @@ License: LGPL-2.1+3+KDEeV
  can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
  the complete text of the GNU Lesser General Public License version 3
  can be found in `/usr/share/common-licenses/LGPL-3'.
-
diff --git a/debian/kf6-kpimgapi-dev.install b/debian/kf6-kpimgapi-dev.install
index 67617e5..29fcf39 100644
--- a/debian/kf6-kpimgapi-dev.install
+++ b/debian/kf6-kpimgapi-dev.install
@@ -1,6 +1,6 @@
 usr/include/KPim6/KGAPI/
-usr/lib/*/cmake/KPimGAPI/
 usr/lib/*/cmake/KPim6GAPI/
+usr/lib/*/cmake/KPimGAPI/
 usr/lib/*/libKPim6GAPIBlogger.so
 usr/lib/*/libKPim6GAPICalendar.so
 usr/lib/*/libKPim6GAPICore.so
diff --git a/debian/kf6-kpimgapi.install b/debian/kf6-kpimgapi.install
index ec7051e..c0006c5 100644
--- a/debian/kf6-kpimgapi.install
+++ b/debian/kf6-kpimgapi.install
@@ -1,4 +1,4 @@
-usr/lib/*/libKPim6GAPI*.so.6
 usr/lib/*/libKPim6GAPI*.so*.*
-usr/share/qlogging-categories6/libkgapi.categories
+usr/lib/*/libKPim6GAPI*.so.6
 usr/share/locale/
+usr/share/qlogging-categories6/libkgapi.categories
diff --git a/debian/rules b/debian/rules
index cec1d26..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #!/usr/bin/make -f
-
-export DH_VERBOSE=1
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
 	dh $@ --with kf6 --buildsystem kf6
-
-override_dh_auto_test:
-	xvfb-run --\
-	           dh_auto_test