[neon/kde/akonadi-import-wizard/Neon/unstable] debian: more kf6ify

[Carlos De Maine]

Git commit 9710dc71a49952f69361a11a7a035ca24785bfb8 by Carlos De Maine.
Committed on 24/09/2023 at 09:19.
Pushed by carlosdem into branch 'Neon/unstable'.

more kf6ify

D  +0    -1    debian/compat
M  +21   -29   debian/control
R  +1    -1    debian/kpim6-import-wizard.install [from: debian/akonadi-import-wizard.install - 092% similarity]
A  +4    -0    debian/kpim6-importwizard-dev.install
R  +0    -0    debian/kpim6-importwizard.maintscript [from: debian/akonadi-import-wizard.maintscript - 100% similarity]
D  +0    -4    debian/libkpimimportwizard-dev.install

https://invent.kde.org/neon/kde/akonadi-import-wizard/-/commit/9710dc71a49952f69361a11a7a035ca24785bfb8

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 e9d310b..ee46f25 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.1~),
-               debhelper (>= 11),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kauth-dev,
                kf6-kconfig-dev,
@@ -30,37 +30,28 @@ Build-Depends: cmake (>= 3.1~),
                kpim6-messageviewer-dev,
                kpim6-pimcommon-dev,
                kpim6-templateparser-dev,
-               libqgpgme-dev,
+               libqgpgme15-qt6-dev,
                pkg-config,
                pkg-kde-tools-neon,
                qt6-base-dev,
                qtkeychain-qt6-dev
-Standards-Version: 4.3.0
+Standards-Version: 4.6.2
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/akonadi-import-wizard
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi-import-wizard.git
 
-Package: akonadi-import-wizard
-Section: mail
+Package: kpim6-import-wizard
 Architecture: any
-Depends: kpim6-importwizard (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: kdepim-doc (<< 4:17.08~),
-        kmail (<< 4:17.08~),
-        kontact (<< 4:17.08~),
-        ${kde-l10n:all}
-Replaces: kdepim-doc (<< 4:17.08~),
-          kmail (<< 4:17.08~),
-          kontact (<< 4:17.08~),
-          ${kde-l10n:all}
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: PIM data import wizard
  akonadi-import-wizard is an assistant to import PIM data from other
  applications into Akonadi for use in KDE PIM applications
 
-Package: libkpimimportwizard-dev
-Section: libdevel
+Package: kpim6-importwizard-dev
 Architecture: any
+X-Neon-MergedPackage: true
 Multi-Arch: same
 Depends: kpim6-importwizard (= ${binary:Version}),
          kpim6-mailtransport-dev,
@@ -70,15 +61,16 @@ Description: PIM data import wizard - devel files
  akonadi-import-wizard is an assistant to import PIM data from other
  applications into Akonadi for use in KDE PIM applications
  .
- This package contains the import wizard developmentt files.
+ This package contains the import wizard development files.
 
 Package: libkpimimportwizard5
-Section: libs
-Architecture: any
-Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: PIM data import wizard - library
- akonadi-import-wizard is an assistant to import PIM data from other
- applications into Akonadi for use in KDE PIM applications
- .
- This package contains the import wizard shared libraries.
+Architecture: all
+Depends: kpim6-importwizard
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: akonadi-import-wizard
+Architecture: all
+Depends: kpim6-importwizard
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/akonadi-import-wizard.install b/debian/kpim6-import-wizard.install
similarity index 92%
rename from debian/akonadi-import-wizard.install
rename to debian/kpim6-import-wizard.install
index c885cc1..57aa38d 100644
--- a/debian/akonadi-import-wizard.install
+++ b/debian/kpim6-import-wizard.install
@@ -1,5 +1,5 @@
 usr/bin/akonadiimportwizard
-usr/lib/*/qt5/plugins
+usr/lib/*/qt6/plugins
 usr/share/applications/org.kde.akonadiimportwizard.desktop
 usr/share/doc
 usr/share/icons
diff --git a/debian/kpim6-importwizard-dev.install b/debian/kpim6-importwizard-dev.install
new file mode 100644
index 0000000..388e811
--- /dev/null
+++ b/debian/kpim6-importwizard-dev.install
@@ -0,0 +1,4 @@
+usr/include/KPim6/
+usr/lib/*/cmake/KPim6ImportWizard/
+usr/lib/*/cmake/KPimImportWizard/
+usr/lib/*/libKPim6ImportWizard.so
diff --git a/debian/akonadi-import-wizard.maintscript b/debian/kpim6-importwizard.maintscript
similarity index 100%
rename from debian/akonadi-import-wizard.maintscript
rename to debian/kpim6-importwizard.maintscript
diff --git a/debian/libkpimimportwizard-dev.install b/debian/libkpimimportwizard-dev.install
deleted file mode 100644
index 12fedf5..0000000
--- a/debian/libkpimimportwizard-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/KPim6/
-usr/lib/*/cmake/KPim5ImportWizard/
-usr/lib/*/cmake/KPimImportWizard/
-usr/lib/*/libKPim5ImportWizard.so