[neon/kde/ksmtp/Neon/unstable] debian: more kf6ify

[Carlos De Maine]

Git commit 24d96b0d2f6fcfa3bcff2da419a45077f0cb86af by Carlos De Maine.
Committed on 24/09/2023 at 23:14.
Pushed by carlosdem into branch 'Neon/unstable'.

more kf6ify

D  +0    -1    debian/compat
M  +21   -6    debian/control
D  +0    -1    debian/files
D  +0    -5    debian/libkpimsmtp-dev.install
D  +0    -1    debian/libkpimsmtp-dev.maintscript
D  +0    -3    debian/libkpimsmtp5.install
D  +0    -1    debian/libkpimsmtp5.lintian-overrides

https://invent.kde.org/neon/kde/ksmtp/-/commit/24d96b0d2f6fcfa3bcff2da419a45077f0cb86af

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 36594e7..d9bba94 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 10),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kcoreaddons-dev,
                kf6-ki18n-dev,
@@ -13,14 +13,16 @@ Build-Depends: cmake (>= 2.8.12~),
                libsasl2-dev,
                pkg-kde-tools-neon,
                qt6-base-dev
-Standards-Version: 4.0.0
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/pim/ksmtp
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/ksmtp
 Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/ksmtp
 
-Package: libkpimsmtp-dev
-Section: libdevel
+Package: kpim6-ksmtp-dev
 Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: misc:Depends, shlibs:Depends
 Depends: kf6-kcoreaddons-dev,
          kf6-kio-dev,
          kf6-smtp (= ${binary:Version}),
@@ -35,11 +37,24 @@ Description: library for handling SMTP data
  .
  This package contains the development files.
 
-Package: libkpimsmtp5
+Package: kpim6-ksmtp
 Architecture: any
+X-Neon-MergedPackage: true
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for handling SMTP data
  This library provides an API for handling SMTP services.
  SMTP (Simple Mail Transfer Protocol) is the most prevalent
  Internet standard protocols for e-mail transmission.
+
+Package: libkpimsmtp-dev
+Architecture: all
+Depends: kpim6-ksmtp-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkpimsmtp5
+Architecture: all
+Depends: kpim6-ksmtp
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/files b/debian/files
deleted file mode 100644
index b0447b1..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-ksmtp_17.07.80-0ubuntu1_source.buildinfo libs optional
diff --git a/debian/libkpimsmtp-dev.install b/debian/libkpimsmtp-dev.install
deleted file mode 100644
index ab967ac..0000000
--- a/debian/libkpimsmtp-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/KPim6/KSMTP/
-usr/lib/*/cmake/KPim5SMTP/
-usr/lib/*/libKPim5SMTP.so
-usr/lib/*/qt6/mkspecs/modules/qt_KSMTP.pri
-usr/share/qlogging-categories6/ksmtp.categories
diff --git a/debian/libkpimsmtp-dev.maintscript b/debian/libkpimsmtp-dev.maintscript
deleted file mode 100644
index 07243ab..0000000
--- a/debian/libkpimsmtp-dev.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/xdg/ksmtp.categories
diff --git a/debian/libkpimsmtp5.install b/debian/libkpimsmtp5.install
deleted file mode 100644
index 322f8e8..0000000
--- a/debian/libkpimsmtp5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libKPim5SMTP.so.5
-usr/lib/*/libKPim5SMTP.so.5.*
-usr/share/locale/*
diff --git a/debian/libkpimsmtp5.lintian-overrides b/debian/libkpimsmtp5.lintian-overrides
deleted file mode 100644
index 3a8e08d..0000000
--- a/debian/libkpimsmtp5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkpimsmtp5: package-name-doesnt-match-sonames libKPim5SMTP5