[neon/kde/akonadi-contacts/Neon/release] debian: breaks libkpim5akonadicontact-data which is from ubuntu and has overlapping files

[Jonathan Riddell]

Git commit 530ab5879569b7196a3f512b4f774cd43e0647e9 by Jonathan Riddell.
Committed on 09/07/2024 at 11:31.
Pushed by jriddell into branch 'Neon/release'.

breaks libkpim5akonadicontact-data which is from ubuntu and has overlapping files

M  +19   -17   debian/control
M  +1    -1    debian/kpim6-akonadi-contacts-dev.install
M  +2    -2    debian/kpim6-akonadi-contacts.install

https://invent.kde.org/neon/kde/akonadi-contacts/-/commit/530ab5879569b7196a3f512b4f774cd43e0647e9

diff --git a/debian/control b/debian/control
index f28ed03..6dabb18 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,8 @@ Build-Depends: cmake,
                kpim6-akonadi-dev,
                kpim6-akonadi-mime-dev,
                kpim6-grantleetheme-dev,
-               kpim6-libkleo-dev,
                kpim6-kmime-dev,
+               kpim6-libkleo-dev,
                pkg-config,
                pkg-kde-tools-neon,
                qt6-base-dev,
@@ -46,24 +46,26 @@ Architecture: any
 X-Neon-MergedPackage: true
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Provides: akonadi-contacts-data, 
-          libkpim6akonadicontact6,
-          libkpim6contacteditor6,
-          libkpim6contacteditor-data,
+Provides: akonadi-contacts-data,
+          libkf5akonadicontact-data,
           libkf5akonadicontact5,
           libkf5akonadicontact5abi1,
-          libkf5akonadicontact-data,
-          libkf5contacteditor5,
           libkf5contacteditor-data,
-Replaces: akonadi-contacts-data, 
+          libkf5contacteditor5,
           libkpim6akonadicontact6,
-          libkpim6contacteditor6,
           libkpim6contacteditor-data,
+          libkpim6contacteditor6
+Replaces: akonadi-contacts-data,
+          libkf5akonadicontact-data,
           libkf5akonadicontact5,
           libkf5akonadicontact5abi1,
-          libkf5akonadicontact-data,
-          libkf5contacteditor5,
           libkf5contacteditor-data,
+          libkf5contacteditor5,
+          libkpim5akonadicontact-data,
+          libkpim6akonadicontact6,
+          libkpim6contacteditor-data,
+          libkpim6contacteditor6
+Breaks: libkpim5akonadicontact-data
 Description: Akonadi contacts access library - data files
  This library provides contacts manipulation helpers using the
  Akonadi PIM data server.
@@ -83,14 +85,14 @@ Depends: kf6-kcolorscheme-dev,
          kpim6-akonadi-dev,
          kpim6-grantleetheme-dev,
          ${misc:Depends}
-Provides: libkpim6akonadicontact-dev,
-          libkpim6contacteditor-dev,
-          libkf5akonadicontact-dev,
+Provides: libkf5akonadicontact-dev,
           libkf5contacteditor-dev,
-Replaces: libkpim6akonadicontact-dev,
-          libkpim6contacteditor-dev,
-          libkf5akonadicontact-dev,
+          libkpim6akonadicontact-dev,
+          libkpim6contacteditor-dev
+Replaces: libkf5akonadicontact-dev,
           libkf5contacteditor-dev,
+          libkpim6akonadicontact-dev,
+          libkpim6contacteditor-dev
 Description: Akonadi contacts access library - development files
  This library provides contacts manipulation helpers using the
  Akonadi PIM data server.
diff --git a/debian/kpim6-akonadi-contacts-dev.install b/debian/kpim6-akonadi-contacts-dev.install
index 141a650..dfa5216 100644
--- a/debian/kpim6-akonadi-contacts-dev.install
+++ b/debian/kpim6-akonadi-contacts-dev.install
@@ -2,4 +2,4 @@ usr/include/KPim6/
 usr/lib/*/cmake/
 usr/lib/*/libKPim6AkonadiContactCore.so
 usr/lib/*/libKPim6AkonadiContactWidgets.so
-usr/share/qt6/doc/
\ No newline at end of file
+usr/share/qt6/doc/
diff --git a/debian/kpim6-akonadi-contacts.install b/debian/kpim6-akonadi-contacts.install
index 536dfb5..f67a507 100644
--- a/debian/kpim6-akonadi-contacts.install
+++ b/debian/kpim6-akonadi-contacts.install
@@ -1,7 +1,7 @@
-usr/lib/*/libKPim6AkonadiContactCore.so.6
 usr/lib/*/libKPim6AkonadiContactCore.so.*.*
-usr/lib/*/libKPim6AkonadiContactWidgets.so.6
+usr/lib/*/libKPim6AkonadiContactCore.so.6
 usr/lib/*/libKPim6AkonadiContactWidgets.so.*.*
+usr/lib/*/libKPim6AkonadiContactWidgets.so.6
 usr/lib/*/qt6/plugins/
 usr/share/akonadi/plugins/serializer/
 usr/share/kf6/akonadi/