[neon/kde/libkgapi/Neon/unstable] debian: x -merged-true

[Carlos De Maine]

Git commit 569af70b17a4156c445d8a903d5e20acb1e3b1dd by Carlos De Maine.
Committed on 24/09/2023 at 23:00.
Pushed by carlosdem into branch 'Neon/unstable'.

x -merged-true

M  +6    -9    debian/control
M  +1    -0    debian/kpim6-kpimgapi-dev.install
M  +3    -0    debian/kpim6-kpimgapi.install
R  +0    -0    debian/kpim6-kpimgapi.lintian-overrides [from: debian/libsasl2-modules-kdexoauth2.lintian-overrides - 100% similarity]
D  +0    -3    debian/libsasl2-modules-kdexoauth2.install

https://invent.kde.org/neon/kde/libkgapi/-/commit/569af70b17a4156c445d8a903d5e20acb1e3b1dd

diff --git a/debian/control b/debian/control
index 1787de6..7383e7e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper-compat (= 13),
                kf6-extra-cmake-modules,
-               kpim6-kcalendarcore-dev,
+               kf6-kcalendarcore-dev,
                kf6-kcontacts-dev,
                kf6-kio-dev,
                kf6-kwallet-dev,
@@ -29,7 +29,7 @@ Section: libdevel
 X-Neon-MergedPackage: true
 Architecture: any
 Multi-Arch: same
-Depends: kpim6-kcalendarcore-dev,
+Depends: kf6-kcalendarcore-dev,
          kf6-kcontacts-dev,
          kpim6-kpimgapi,
          ${misc:Depends},
@@ -52,10 +52,7 @@ 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: kpim6-kpimgapi (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: library to integrate with Cyrus SASL
- This package is part of libkgapi.
+Architecture: all
+Depends: kpim6-akonadi-search
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kpim6-kpimgapi-dev.install b/debian/kpim6-kpimgapi-dev.install
index 1f27f55..be35a6a 100644
--- a/debian/kpim6-kpimgapi-dev.install
+++ b/debian/kpim6-kpimgapi-dev.install
@@ -8,6 +8,7 @@ usr/lib/*/libKPim6GAPILatitude.so
 usr/lib/*/libKPim6GAPIMaps.so
 usr/lib/*/libKPim6GAPIPeople.so
 usr/lib/*/libKPim6GAPITasks.so
+usr/lib/*/sasl2/libkdexoauth2.so
 usr/lib/*/qt6/mkspecs/modules/qt_KGAPIBlogger.pri
 usr/lib/*/qt6/mkspecs/modules/qt_KGAPICalendar.pri
 usr/lib/*/qt6/mkspecs/modules/qt_KGAPICore.pri
diff --git a/debian/kpim6-kpimgapi.install b/debian/kpim6-kpimgapi.install
index cc60bb4..67e97b6 100644
--- a/debian/kpim6-kpimgapi.install
+++ b/debian/kpim6-kpimgapi.install
@@ -1,4 +1,7 @@
 usr/lib/*/libKPim6GAPI*.so.*.*
 usr/lib/*/libKPim6GAPI*.so.6
+usr/lib/*/sasl2/libkdexoauth2.so.3
+usr/lib/*/sasl2/libkdexoauth2.so.3.0.0
+
 usr/share/locale/
 usr/share/qlogging-categories6/libkgapi.categories
diff --git a/debian/libsasl2-modules-kdexoauth2.lintian-overrides b/debian/kpim6-kpimgapi.lintian-overrides
similarity index 100%
rename from debian/libsasl2-modules-kdexoauth2.lintian-overrides
rename to debian/kpim6-kpimgapi.lintian-overrides
diff --git a/debian/libsasl2-modules-kdexoauth2.install b/debian/libsasl2-modules-kdexoauth2.install
deleted file mode 100644
index 2ceb0e4..0000000
--- a/debian/libsasl2-modules-kdexoauth2.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/sasl2/libkdexoauth2.so
-usr/lib/*/sasl2/libkdexoauth2.so.3
-usr/lib/*/sasl2/libkdexoauth2.so.3.0.0