[neon/neon-packaging/libkgapi5/Neon/stable] debian: breaks old libkpimgapi-data for overlapping translation

[Jonathan Esk-Riddell]

Git commit a72492d05fb842c07aae2e7439297907cc5837bd by Jonathan Esk-Riddell.
Committed on 20/02/2024 at 10:19.
Pushed by jriddell into branch 'Neon/stable'.

breaks old libkpimgapi-data for overlapping translation

M  +14   -14   debian/control
M  +0    -1    debian/copyright
M  +1    -1    debian/libkpimgapi5-data.install
M  +1    -1    debian/libkpimgapi5-dev.install

https://invent.kde.org/neon/neon-packaging/libkgapi5/-/commit/a72492d05fb842c07aae2e7439297907cc5837bd

diff --git a/debian/control b/debian/control
index 2d61b79..219b7aa 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: cmake,
                qttools5-dev-tools,
                qtwebengine5-dev,
                xauth,
-               xvfb,
+               xvfb
 Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/libkgapi
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkgapi.git
@@ -40,6 +40,8 @@ Package: libkpimgapi5-data
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libkpimgapi-data (<< 23.08.5)
+Replaces: libkpimgapi-data (<< 23.08.5)
 Description: Google API library for KDE -- data files
  LibKGAPI (previously called LibKGoogle) is a C++ library that implements APIs
  for various Google services.
@@ -61,7 +63,7 @@ Depends: libkf5calendarcore-dev,
          libkpimgapipeople5 (= ${binary:Version}),
          libkpimgapitasks5 (= ${binary:Version}),
          ${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.
@@ -76,7 +78,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Google Blogger service API
  This package is part of libkgapi.
 
@@ -85,7 +87,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Google Calendar service API
  This package is part of libkgapi.
 
@@ -95,7 +97,7 @@ Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          libqt5webengine5,
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: core library to integrate with Google service APIs
  This package is part of libkgapi.
 
@@ -104,7 +106,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Google Drive service API
  This package is part of libkgapi.
 
@@ -113,7 +115,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Google Latitude service API
  This package is part of libkgapi.
 
@@ -122,7 +124,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Google Maps service API
  This package is part of libkgapi.
 
@@ -131,7 +133,7 @@ Architecture: any
 Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Google People service API
  This package is part of libkgapi.
 
@@ -140,17 +142,15 @@ Architecture: any
 Multi-Arch: same
 Depends: libkpimgapi5-data (= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends},
+         ${shlibs:Depends}
 Description: library to integrate with Google Tasks service API
  This package is part of libkgapi.
 
-### transitionals below
-
 Package: libkpimgapicontacts5
 Architecture: all
 Priority: optional
 Section: oldlibs
-Depends: libkpimgapi5-data, ${misc:Depends},
+Depends: libkpimgapi5-data, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
@@ -158,6 +158,6 @@ Package: libsasl2-modules-kdexoauth2
 Architecture: all
 Priority: optional
 Section: oldlibs
-Depends: libkpimgapi5-data, ${misc:Depends},
+Depends: libkpimgapi5-data, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
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/libkpimgapi5-data.install b/debian/libkpimgapi5-data.install
index 8ac0af7..6d047f6 100644
--- a/debian/libkpimgapi5-data.install
+++ b/debian/libkpimgapi5-data.install
@@ -1,2 +1,2 @@
-usr/share/qlogging-categories5/libkgapi.categories
 usr/share/locale/
+usr/share/qlogging-categories5/libkgapi.categories
diff --git a/debian/libkpimgapi5-dev.install b/debian/libkpimgapi5-dev.install
index 3d6eaed..1712a49 100644
--- a/debian/libkpimgapi5-dev.install
+++ b/debian/libkpimgapi5-dev.install
@@ -1,6 +1,6 @@
 usr/include/KPim5/KGAPI/
-usr/lib/*/cmake/KPimGAPI/
 usr/lib/*/cmake/KPim5GAPI/
+usr/lib/*/cmake/KPimGAPI/
 usr/lib/*/libKPim5GAPIBlogger.so
 usr/lib/*/libKPim5GAPICalendar.so
 usr/lib/*/libKPim5GAPICore.so