[neon/kde/libkleo/Neon/unstable] debian: its kpim6-libkleo

[Carlos De Maine]

Git commit 75df1569fa10fd5a62ebb04a9bf55ceff1fb6a2b by Carlos De Maine.
Committed on 25/09/2023 at 06:57.
Pushed by carlosdem into branch 'Neon/unstable'.

its kpim6-libkleo

M  +1    -1    debian/changelog
M  +8    -8    debian/control
D  +0    -8    debian/kpim6-kleo.install
D  +0    -1    debian/kpim6-kleo.lintian-overrides
R  +0    -0    debian/kpim6-libkleo-dev.install [from: debian/kpim6-kleo-dev.install - 100% similarity]
A  +6    -0    debian/kpim6-libkleo.install
A  +1    -0    debian/kpim6-libkleo.lintian-overrides
R  +0    -0    debian/kpim6-libkleo.maintscript [from: debian/kpim6-kleo.maintscript - 100% similarity]

https://invent.kde.org/neon/kde/libkleo/-/commit/75df1569fa10fd5a62ebb04a9bf55ceff1fb6a2b

diff --git a/debian/changelog b/debian/changelog
index 0b84290..b9d8ed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libkf5libkleo (4:23.08.1-0neon) jammy; urgency=medium
+kpim6-libkleo (4:23.08.1-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/control b/debian/control
index 098e3b3..a89eefb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libkf5libkleo
+Source:kpim6-libkleo
 Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
@@ -28,12 +28,12 @@ Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkleo
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkleo.git
 
-Package: kpim6-kleo-dev
+Package: kpim6-libkleo-dev
 Architecture: any
 X-Neon-MergedPackage: true
 Multi-Arch: same
 Depends: kf6-kwidgetsaddons-dev,
-         kpim6-kleo (= ${binary:Version}),
+         kpim6-libkleo (= ${binary:Version}),
          libboost-dev (>= 1.34.0~),
          libgpgme-dev,
          libgpgmepp-dev (>= 1.8.0~),
@@ -45,11 +45,11 @@ Description: KDE PIM cryptographic library, devel files
  .
  This package is part of the KDE PIM module.
 
-Package: kpim6-kleo
+Package: kpim6-libkleo
 Architecture: any
 X-Neon-MergedPackage: true
 Multi-Arch: same
-Depends: misc:Depends, shlibs:Depends
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: KDE PIM cryptographic library
  This package contains libkleo, a library for Kleopatra and other parts of KDE
  using certificate-based crypto.
@@ -58,19 +58,19 @@ Description: KDE PIM cryptographic library
 
 Package: libkf6libkleo-data
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-libkleo
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6libkleo-dev
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-libkleo-dev
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6libkleo6
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-libkleo
 Description: Dummy transitional
  Transitional dummy package.
 
diff --git a/debian/kpim6-kleo.install b/debian/kpim6-kleo.install
deleted file mode 100644
index 246f7bc..0000000
--- a/debian/kpim6-kleo.install
+++ /dev/null
@@ -1,8 +0,0 @@
-etc/xdg/libkleopatrarc
-usr/lib/*/libKPim6Libkleo.so.6
-usr/lib/*/libKPim6Libkleo.so.*.*
-usr/share/libkleopatra/
-usr/share/locale/
-usr/share/qlogging-categories6/libkleo.categories
-usr/share/qlogging-categories6/libkleo.categories
-usr/share/qlogging-categories6/libkleo.renamecategories
diff --git a/debian/kpim6-kleo.lintian-overrides b/debian/kpim6-kleo.lintian-overrides
deleted file mode 100644
index 34bb627..0000000
--- a/debian/kpim6-kleo.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kpim6-kleo: package-name-doesnt-match-sonames libKPim6Libkleo6
diff --git a/debian/kpim6-kleo-dev.install b/debian/kpim6-libkleo-dev.install
similarity index 100%
rename from debian/kpim6-kleo-dev.install
rename to debian/kpim6-libkleo-dev.install
diff --git a/debian/kpim6-libkleo.install b/debian/kpim6-libkleo.install
new file mode 100644
index 0000000..a8e00a9
--- /dev/null
+++ b/debian/kpim6-libkleo.install
@@ -0,0 +1,6 @@
+etc/xdg/libkleopatrarc
+usr/lib/*/libKPim6Libkleo.so.6
+usr/lib/*/libKPim6Libkleo.so.*.*
+usr/share/libkleopatra/
+usr/share/locale/
+usr/share/qlogging-categories6/
diff --git a/debian/kpim6-libkleo.lintian-overrides b/debian/kpim6-libkleo.lintian-overrides
new file mode 100644
index 0000000..a2a3054
--- /dev/null
+++ b/debian/kpim6-libkleo.lintian-overrides
@@ -0,0 +1 @@
+kpim6-libkleo: package-name-doesnt-match-sonames libKPim6Libkleo6
diff --git a/debian/kpim6-kleo.maintscript b/debian/kpim6-libkleo.maintscript
similarity index 100%
rename from debian/kpim6-kleo.maintscript
rename to debian/kpim6-libkleo.maintscript