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

Carlos De Maine null at kde.org
Mon Sep 25 07:51:32 BST 2023


Git commit 17fab5548ca5c98f02719a387a64811ddd489529 by Carlos De Maine.
Committed on 25/09/2023 at 08:51.
Pushed by carlosdem into branch 'Neon/unstable'.

more kf6ify

D  +0    -1    debian/compat
M  +43   -86   debian/control
D  +0    -1    debian/kde-config-mailtransport.install
D  +0    -2    debian/kio-smtp.maintscript
M  +1    -0    debian/kmailtransport-akonadi.install
D  +0    -1    debian/kmailtransport-smtp.install
A  +4    -0    debian/kpim6-kmailtransport-dev.install
R  +2    -0    debian/kpim6-kmailtransport.install [from: debian/libkf5mailtransport5.install - 088% similarity]
A  +1    -0    debian/kpim6-kmailtransport.lintian-overrides
R  +0    -0    debian/kpim6-kmailtransport.maintscript [from: debian/libkf5mailtransport5.maintscript - 100% similarity]
D  +0    -1    debian/libkf5mailtransport-data.install
D  +0    -22   debian/libkf5mailtransport-dev.acc.in
D  +0    -5    debian/libkf5mailtransport-dev.install
D  +0    -1    debian/libkf5mailtransport5.lintian-overrides
D  +0    -1    debian/libkf5mailtransportakonadi5.install
D  +0    -1    debian/libkf5mailtransportakonadi5.lintian-overrides

https://invent.kde.org/neon/kde/kmailtransport/-/commit/17fab5548ca5c98f02719a387a64811ddd489529

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 58a94e9..3ca2fd5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,35 +3,32 @@ 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 (>= 9),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kf6-kcmutils-dev,
                kf6-kconfigwidgets-dev,
                kf6-kwallet-dev,
                kpim6-akonadi-dev,
                kpim6-akonadi-mime-dev,
-               kpim6-mime-dev,
-               libkpimgapi-dev,
-               libkpimsmtp-dev,
+               kpim6-kmime-dev,
+               kpim6-ksmtp-dev,
+               kpim6-libkgapi-dev,
                libsasl2-dev,
                pkg-config,
                pkg-kde-tools-neon,
                qt6-base-dev,
                qtkeychain-qt6-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/pim/kmailtransport
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kmailtransport.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kmailtransport.git
 
-Package: kmailtransport-akonadi
+Package: kpim6-kmailtransport
 Architecture: any
 Multi-Arch: no
-Depends: kpim6-mailtransport (= ${binary:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends}
-Replaces: ${kde-l10n:all}
-Breaks: ${kde-l10n:all}
 Description: mail transport akonadi library
  Mailtransport is a library that provides the following functionality:
  .
@@ -41,13 +38,13 @@ Description: mail transport akonadi library
  .
  This package contains the akonadi plugin.
 
-Package: libkf5mailtransport-dev
+Package: kpim6-kmailtransport-dev
 Section: libdevel
 Architecture: any
 Depends: kf6-kwallet-dev,
          kpim6-akonadi-mime-dev,
+         kpim6-kmime-dev,
          kpim6-mailtransport (= ${binary:Version}),
-         kpim6-mime-dev,
          libsasl2-dev,
          ${misc:Depends}
 Description: mail transport service library - development files
@@ -59,84 +56,44 @@ Description: mail transport service library - development files
  .
  This package contains the development files.
 
-Package: libkf5mailtransport-data
+Package: kmailtransport-akonadi
 Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5mailtransport5 (<< 15.07.90+git20150819.1000)
-Replaces: libkf5mailtransport5 (<< 15.07.90+git20150819.1000)
-Description: mail transport service library - data files
- Mailtransport is a library that provides the following functionality:
- .
-  * Shared mail transport settings.
-  * GUI elements to configure mail transport settings.
-  * Job classes for mail sending.
- .
- This package also contains a KDE control module which can be embedded
- into your application to provide mail transport configuration.
- .
- This package contains data files.
+Depends: kpim6-kmailtransport
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6mailtransport-dev
+Architecture: all
+Depends: kpim6-kmailtransport
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6mailtransport-data
+Architecture: all
+Depends: kpim6-kmailtransport
+Description: Dummy transitional
+ Transitional dummy package.
 
 Package: kde-config-mailtransport
-Architecture: any
-Multi-Arch: same
-Depends: kpim6-mailtransport (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libkf5mailtransport5 (<< 15.07.90+git20150819.1000)
-Replaces: libkf5mailtransport5 (<< 15.07.90+git20150819.1000)
-Description: mail transport service KCM
- Mailtransport is a library that provides the following functionality:
- .
-  * Shared mail transport settings.
-  * GUI elements to configure mail transport settings.
-  * Job classes for mail sending.
- .
- This package also contains a KDE control module which can be embedded
- into your application to provide mail transport configuration.
+Architecture: all
+Depends: kpim6-kmailtransport
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: libkf5mailtransport5
-Architecture: any
-Multi-Arch: same
-Depends: kpim6-mailtransport (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: kde-config-mailtransport
-Breaks: kio-smtp (<< 17.08.3-0neon+16.04+xenial+build52~), ${kde-l10n:all}
-Replaces: kio-smtp (<< 17.08.3-0neon+16.04+xenial+build52~), ${kde-l10n:all}
-Description: mail transport service library
- Mailtransport is a library that provides the following functionality:
- .
-  * Shared mail transport settings.
-  * GUI elements to configure mail transport settings.
-  * Job classes for mail sending.
- .
- This package also contains a KDE control module which can be embedded
- into your application to provide mail transport configuration.
+Package: libkf6mailtransport6
+Architecture: all
+Depends: kpim6-kmailtransport
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: libkf5mailtransportakonadi5
-Architecture: any
-Multi-Arch: same
-Depends: kpim6-mailtransport (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: kde-config-mailtransport
-Description: mail transport service library for akonadi
- Mailtransport is a library that provides the following functionality:
- .
-  * Shared mail transport settings.
-  * GUI elements to configure mail transport settings.
-  * Job classes for mail sending.
- .
- This library integrates with Akonadi.
- .
- This package also contains a KDE control module which can be embedded
- into your application to provide mail transport configuration.
+Package: libkf6mailtransportakonadi6
+Architecture: all
+Depends: kpim6-kmailtransport
+Description: Dummy transitional
+ Transitional dummy package.
 
 Package: kio-smtp
-Section: oldlibs
 Architecture: all
-Priority: optional
-Depends: kpim6-mailtransport, ${misc:Depends}
-Description: transitional package
- This is a transitional package. It can safely be removed.
+Depends: kpim6-kmailtransport
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/kde-config-mailtransport.install b/debian/kde-config-mailtransport.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/kde-config-mailtransport.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/kio-smtp.maintscript b/debian/kio-smtp.maintscript
deleted file mode 100644
index b2e486c..0000000
--- a/debian/kio-smtp.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-rm_conffile /etc/xdg/kmailtransport.categories 17.08.3-0neon+16.04+xenial+build32 kio-smtp
-rm_conffile /etc/xdg/kmailtransport.renamecategories 17.08.3-0neon+16.04+xenial+build32 kio-smtp
diff --git a/debian/kmailtransport-akonadi.install b/debian/kmailtransport-akonadi.install
index 8b13789..a00bf43 100644
--- a/debian/kmailtransport-akonadi.install
+++ b/debian/kmailtransport-akonadi.install
@@ -1 +1,2 @@
+usr/share/config.kcfg/mailtransport.kcfg
 
diff --git a/debian/kmailtransport-smtp.install b/debian/kmailtransport-smtp.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/kmailtransport-smtp.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/kpim6-kmailtransport-dev.install b/debian/kpim6-kmailtransport-dev.install
new file mode 100644
index 0000000..fa1f607
--- /dev/null
+++ b/debian/kpim6-kmailtransport-dev.install
@@ -0,0 +1,4 @@
+usr/include/KPim6/
+usr/lib/*/cmake/KPim6MailTransport/
+usr/lib/*/libKPim6MailTransport.so
+usr/lib/*/qt6/mkspecs/modules/qt_KMailTransport.pri
diff --git a/debian/libkf5mailtransport5.install b/debian/kpim6-kmailtransport.install
similarity index 88%
rename from debian/libkf5mailtransport5.install
rename to debian/kpim6-kmailtransport.install
index 850d47f..9a56bde 100644
--- a/debian/libkf5mailtransport5.install
+++ b/debian/kpim6-kmailtransport.install
@@ -1,6 +1,8 @@
 usr/lib/*/libKPim5MailTransport.so.5
 usr/lib/*/libKPim5MailTransport.so.5.*
 usr/lib/*/qt6/plugins/pim5/mailtransport/mailtransport_smtpplugin.so
+usr/share/config.kcfg/mailtransport.kcfg
 usr/share/locale/*/LC_MESSAGES/libmailtransport5.mo
 usr/share/qlogging-categories6/kmailtransport.categories
 usr/share/qlogging-categories6/kmailtransport.renamecategories
+
diff --git a/debian/kpim6-kmailtransport.lintian-overrides b/debian/kpim6-kmailtransport.lintian-overrides
new file mode 100644
index 0000000..5278dde
--- /dev/null
+++ b/debian/kpim6-kmailtransport.lintian-overrides
@@ -0,0 +1 @@
+kpim6-kmailtransport: package-name-doesnt-match-sonames libKPim6MailTransport6
diff --git a/debian/libkf5mailtransport5.maintscript b/debian/kpim6-kmailtransport.maintscript
similarity index 100%
rename from debian/libkf5mailtransport5.maintscript
rename to debian/kpim6-kmailtransport.maintscript
diff --git a/debian/libkf5mailtransport-data.install b/debian/libkf5mailtransport-data.install
deleted file mode 100644
index 3d5604f..0000000
--- a/debian/libkf5mailtransport-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/config.kcfg/mailtransport.kcfg
diff --git a/debian/libkf5mailtransport-dev.acc.in b/debian/libkf5mailtransport-dev.acc.in
deleted file mode 100644
index ae014fe..0000000
--- a/debian/libkf5mailtransport-dev.acc.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    15.07.90
-</version>
-
-<headers>
-    /usr/include/KF5/MailTransport/
-    /usr/include/KF5/mailtransport_version.h
-</headers>
-
-<libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5MailTransport.so
-</libs>
-
-<gcc_options>
-    -fPIC
-    -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkf5mailtransport-dev.install b/debian/libkf5mailtransport-dev.install
deleted file mode 100644
index 385fd5b..0000000
--- a/debian/libkf5mailtransport-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/include/KPim6/
-usr/lib/*/cmake/KF5MailTransport/
-usr/lib/*/cmake/KPim5MailTransport/
-usr/lib/*/libKPim5MailTransport.so
-usr/lib/*/qt6/mkspecs/modules/qt_KMailTransport.pri
diff --git a/debian/libkf5mailtransport5.lintian-overrides b/debian/libkf5mailtransport5.lintian-overrides
deleted file mode 100644
index 4973a38..0000000
--- a/debian/libkf5mailtransport5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5mailtransport5: package-name-doesnt-match-sonames libKPim5MailTransport5
\ No newline at end of file
diff --git a/debian/libkf5mailtransportakonadi5.install b/debian/libkf5mailtransportakonadi5.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/libkf5mailtransportakonadi5.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/libkf5mailtransportakonadi5.lintian-overrides b/debian/libkf5mailtransportakonadi5.lintian-overrides
deleted file mode 100644
index f2e8a98..0000000
--- a/debian/libkf5mailtransportakonadi5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5mailtransportakonadi5: package-name-doesnt-match-sonames libKPim5MailTransportAkonadi5
\ No newline at end of file


More information about the Neon-commits mailing list