[neon/kde/libkgapi/Neon/unstable] debian: more kpim6ing

[Carlos De Maine]

Git commit 5c3f2cee27478e0dd8aa1fe62aea063d87558847 by Carlos De Maine.
Committed on 24/09/2023 at 15:08.
Pushed by carlosdem into branch 'Neon/unstable'.

more kpim6ing

D  +0    -1    debian/compat
M  +14   -11   debian/control
R  +0    -0    debian/kpim6-kpimgapi-dev.install [from: debian/kf6-kpimgapi-dev.install - 100% similarity]
R  +1    -1    debian/kpim6-kpimgapi.install [from: debian/kf6-kpimgapi.install - 075% similarity]

https://invent.kde.org/neon/kde/libkgapi/-/commit/5c3f2cee27478e0dd8aa1fe62aea063d87558847

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de3947..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 1be7712b..7fb4a441 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kcalendarcore-dev,
                kf6-kcontacts-dev,
@@ -19,18 +19,18 @@ Build-Depends: cmake (>= 3.0~),
                qt6-webengine-dev,
                xauth,
                xvfb
-Standards-Version: 4.3.0
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/libkgapi
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkgapi.git
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkgapi
 
-Package: kf6-kpimgapi-dev
+Package: kpim6-kpimgapi-dev
 Section: libdevel
 X-Neon-MergedPackage: true
 Architecture: any
 Multi-Arch: same
-Depends: kf6-calendarcore-dev,
-         kf6-contacts-dev,
+Depends: kf6-kcalendarcore-dev,
+         kf6-kcontacts-dev,
          kf6-kpimgapi,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -41,18 +41,21 @@ Description: Google API library for KDE -- development files
  This package contains development files for building software that uses
  the LibKGAPI library.
 
-Package: kf6-kpimgapi
+Package: kpim6-kpimgapi
 Architecture: any
+X-Neon-MergedPackage: true
 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}
-Breaks: kdepim-runtime (<< 4:18.04.9)
-Replaces: kdepim-runtime (<< 4:18.04.9)
+Depends: kf6-kpimgapi (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Cyrus SASL
  This package is part of libkgapi.
diff --git a/debian/kf6-kpimgapi-dev.install b/debian/kpim6-kpimgapi-dev.install
similarity index 100%
rename from debian/kf6-kpimgapi-dev.install
rename to debian/kpim6-kpimgapi-dev.install
diff --git a/debian/kf6-kpimgapi.install b/debian/kpim6-kpimgapi.install
similarity index 75%
rename from debian/kf6-kpimgapi.install
rename to debian/kpim6-kpimgapi.install
index c0006c58..cc60bb4e 100644
--- a/debian/kf6-kpimgapi.install
+++ b/debian/kpim6-kpimgapi.install
@@ -1,4 +1,4 @@
-usr/lib/*/libKPim6GAPI*.so*.*
+usr/lib/*/libKPim6GAPI*.so.*.*
 usr/lib/*/libKPim6GAPI*.so.6
 usr/share/locale/
 usr/share/qlogging-categories6/libkgapi.categories