[neon/kde/libgravatar/Neon/release-lts] debian: depend on libkf5gravatar-data, not break it

[Jonathan Riddell]

Git commit e8f97da69a5c91287e6e481e8c8df483d59008e9 by Jonathan Riddell.
Committed on 19/02/2021 at 10:51.
Pushed by jriddell into branch 'Neon/release-lts'.

depend on libkf5gravatar-data, not break it

M  +8    -6    debian/control
M  +0    -1    debian/copyright
M  +1    -1    debian/libkf5gravatar-data.install

https://invent.kde.org/neon/kde/libgravatar/commit/e8f97da69a5c91287e6e481e8c8df483d59008e9

diff --git a/debian/control b/debian/control
index 23d0120..504d118 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cmake (>= 3.0~),
                pkg-kde-tools (>= 0.12),
                qtbase5-dev (>= 5.9.0~),
                xauth,
-               xvfb,
+               xvfb
 Standards-Version: 4.3.0
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libgravatar
@@ -26,8 +26,8 @@ Package: libkf5gravatar-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}
-Breaks: libkf5gravatar5, ${kde-l10n:all}
-Replaces: libkf5gravatar5, ${kde-l10n:all}
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: KDE PIM gravatar library - data files
  This internal library is a brigde for using the gravatar service from KDE PIM
  applications.
@@ -44,7 +44,7 @@ Depends: libkf5config-dev (>= 5.39.0~),
          libkf5gravatar5 (= ${binary:Version}),
          qtbase5-dev (>= 5.8.0~),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: KDE PIM gravatar library, devel files
  This internal library is a brigde for using the gravatar service from KDE PIM
  applications.
@@ -57,11 +57,13 @@ Description: KDE PIM gravatar library, devel files
 Package: libkf5gravatar5
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf5gravatar-data (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: kdepim-addons (<< 17.08),
         kmail (<< 4:17.08),
         libkf5messageviewer5 (<< 4:17.08),
-        ${kde-l10n:all},
+        ${kde-l10n:all}
 Replaces: ${kde-l10n:all}
 Description: KDE PIM gravatar library
  This internal library is a brigde for using the gravatar service from KDE PIM
diff --git a/debian/copyright b/debian/copyright
index 3f2ae83..7409c36 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -52,4 +52,3 @@ License: LGPL-2.1+3+KDEeV
  .
  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/libkf5gravatar-data.install b/debian/libkf5gravatar-data.install
index b56db8e..50df1bf 100644
--- a/debian/libkf5gravatar-data.install
+++ b/debian/libkf5gravatar-data.install
@@ -1,3 +1,3 @@
+usr/share/locale/
 usr/share/qlogging-categories5/libgravatar.categories
 usr/share/qlogging-categories5/libgravatar.renamecategories
-usr/share/locale/