[neon/kde/kitinerary/Neon/unstable] debian: Finish kf6ify

[Scarlett Moore]

Git commit 72bba6167184e6b8a1a18dc31381f3fe46ebe8a8 by Scarlett Moore.
Committed on 25/09/2023 at 20:11.
Pushed by scarlettmoore into branch 'Neon/unstable'.

Finish kf6ify

D  +0    -1    debian/compat
M  +26   -20   debian/control
R  +2    -3    debian/kpim6-itinerary-dev.install [from: debian/libkpimitinerary-dev.install - 051% similarity]
R  +2    -0    debian/kpim6-itinerary.install [from: debian/libkpimitinerary-data.install - 063% similarity]
A  +1    -0    debian/kpim6-itinerary.lintian-overrides
R  +0    -0    debian/kpim6-itinerary.maintscript [from: debian/libkpimitinerary-data.maintscript - 100% similarity]
R  +0    -0    debian/kpim6-itinerary.symbols [from: debian/libkpimitinerary5.symbols - 100% similarity]
D  +0    -2    debian/libkpimitinerary5.install
D  +0    -1    debian/libkpimitinerary5.lintian-overrides

https://invent.kde.org/neon/kde/kitinerary/-/commit/72bba6167184e6b8a1a18dc31381f3fe46ebe8a8

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 6ce2856..58ec9e2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,13 +4,13 @@ Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sandro Knauß <hefee at debian.org>
 Build-Depends: cmake (>= 3.0~),
-               debhelper (>= 11),
+               debhelper-compat (= 12),
                kf6-extra-cmake-modules,
                kf6-ki18n-dev,
-               kpim6-calendar-dev,
-               kpim6-contacts-dev,
-               kpim6-mime-dev,
-               libkpimpkpass-dev,
+               kf6-kcalendar-dev,
+               kf6-kcontacts-dev,
+               kpim6-kmime-dev,
+               kpim6-pkpass-dev,
                libphonenumber-dev,
                libpoppler-private-dev,
                libpoppler-qt6-dev,
@@ -28,19 +28,7 @@ Homepage: https://projects.kde.org/projects/kde/pim/kitinerary/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kitinerary
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kitinerary.git
 
-Package: libkpimitinerary-data
-Architecture: all
-Multi-Arch: foreign
-Breaks: libkpimitinerary5 (<< 19.08.0)
-Replaces: libkpimitinerary5 (<< 19.08.0)
-Depends: ${misc:Depends}
-Description: library for Travel Reservation information - arch independent data
- This library provides an API for Data Model and Extraction System for
- Travel Reservation information.
- .
- This package contains the arch independent data for KPimItinerary.
-
-Package: libkpimitinerary-dev
+Package: kpim6-itinerary-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
@@ -55,10 +43,28 @@ Description: library for Travel Reservation information - development files
  .
  This package contains the development files.
 
-Package: libkpimitinerary5
+Package: kpim6-itinerary
 Architecture: any
 Multi-Arch: same
-Depends: libkpimitinerary-data, ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for Travel Reservation information
  This library provides an API for Data Model and Extraction System for
  Travel Reservation information.
+
+Package: libkpimitinerary-data
+Architecture: all
+Depends: kpim6-itinerary
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkpimitinerary-dev
+Architecture: all
+Depends: kpim6-itinerary-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkpimitinerary6
+Architecture: all
+Depends: kpim6-itinerary
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libkpimitinerary-dev.install b/debian/kpim6-itinerary-dev.install
similarity index 51%
rename from debian/libkpimitinerary-dev.install
rename to debian/kpim6-itinerary-dev.install
index cf99e40..61c26e0 100644
--- a/debian/libkpimitinerary-dev.install
+++ b/debian/kpim6-itinerary-dev.install
@@ -1,6 +1,5 @@
 usr/include/KPim6/KItinerary/
 usr/include/KPim6/kitinerary/
 usr/include/KPim6/kitinerary_version.h
-usr/lib/*/cmake/KPim5Itinerary
-usr/lib/*/cmake/KPimItinerary/
-usr/lib/*/libKPim5Itinerary.so
+usr/lib/*/cmake/KPim6Itinerary
+usr/lib/*/libKPim6Itinerary.so
diff --git a/debian/libkpimitinerary-data.install b/debian/kpim6-itinerary.install
similarity index 63%
rename from debian/libkpimitinerary-data.install
rename to debian/kpim6-itinerary.install
index edd63e9..36e1d9d 100644
--- a/debian/libkpimitinerary-data.install
+++ b/debian/kpim6-itinerary.install
@@ -1,3 +1,5 @@
+usr/lib/*/libKPim6Itinerary.so.*
+usr/lib/*/libexec/kpim6/kitinerary-extractor
 usr/share/locale/
 usr/share/mime/packages/application-vnd-kde-itinerary.xml
 usr/share/qlogging-categories6/org_kde_kitinerary.categories
diff --git a/debian/kpim6-itinerary.lintian-overrides b/debian/kpim6-itinerary.lintian-overrides
new file mode 100644
index 0000000..c4929bc
--- /dev/null
+++ b/debian/kpim6-itinerary.lintian-overrides
@@ -0,0 +1 @@
+libkpimitinerary6: package-name-doesnt-match-sonames libKPim6Itinerary6
diff --git a/debian/libkpimitinerary-data.maintscript b/debian/kpim6-itinerary.maintscript
similarity index 100%
rename from debian/libkpimitinerary-data.maintscript
rename to debian/kpim6-itinerary.maintscript
diff --git a/debian/libkpimitinerary5.symbols b/debian/kpim6-itinerary.symbols
similarity index 100%
rename from debian/libkpimitinerary5.symbols
rename to debian/kpim6-itinerary.symbols
diff --git a/debian/libkpimitinerary5.install b/debian/libkpimitinerary5.install
deleted file mode 100644
index c6b2d1d..0000000
--- a/debian/libkpimitinerary5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKPim5Itinerary.so.5*
-usr/lib/*/libexec/kf5/kitinerary-extractor
diff --git a/debian/libkpimitinerary5.lintian-overrides b/debian/libkpimitinerary5.lintian-overrides
deleted file mode 100644
index d2cfe50..0000000
--- a/debian/libkpimitinerary5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkpimitinerary5: package-name-doesnt-match-sonames libKPim5Itinerary5