From 3b16d50f3682e2b90c4c82e11c12a81cc01d45c6 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 29 Nov 2020 17:50:40 +0900 Subject: DEB: updated relevant modules to use pinentry-tqt if available. Signed-off-by: Michele Calgaro (cherry picked from commit 65934e624857ba5f1849be9eec9a341e84c34d0a) --- dilos/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES | 2 +- dilos/core/tdepim/debian/control | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dilos/core') diff --git a/dilos/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/dilos/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES index a9d4c190d..26f78c8f9 100644 --- a/dilos/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES +++ b/dilos/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES @@ -12,7 +12,7 @@ remove clean:: rule Control has networkstatus-dev package and networkstatus package includes libnetworkstatus.so* files build-dep on gpgsm -kmail depends on gpgsm, gnupg-agent, pinentry-qt | pinentry-x11 +kmail depends on gpgsm, gnupg-agent, pinentry-tqt | pinentry-qt | pinentry-x11 add scalix support remove debian/patches/30_debianize_akregator_default.diff diff --git a/dilos/core/tdepim/debian/control b/dilos/core/tdepim/debian/control index 5f368118d..c29a60f5e 100644 --- a/dilos/core/tdepim/debian/control +++ b/dilos/core/tdepim/debian/control @@ -255,7 +255,7 @@ Section: net Architecture: any Replaces: kleopatra-trinity (<< 4:14.0.0~) Breaks: kleopatra-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-qt | pinentry-x11 +Depends: ${shlibs:Depends}, gnupg-agent, gnupg2, gpgsm, dirmngr, pinentry-tqt | pinentry-qt | pinentry-x11 Description: Trinity Certificate Manager Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm keybox and for retrieving certificates from LDAP servers. @@ -268,8 +268,8 @@ Section: mail Architecture: any Replaces: kmail-trinity (<< 4:14.0.0~) Breaks: kmail-trinity (<< 4:14.0.0~) -Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity, gpgsm, gnupg-agent, pinentry-qt | pinentry-x11 -Suggests: gnupg, gnupg-agent, pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer, procmail +Depends: ${shlibs:Depends}, ${perl:Depends}, tdepim-tdeio-plugins-trinity, tdebase-tdeio-plugins-trinity, gpgsm, gnupg-agent, pinentry-tqt | pinentry-qt | pinentry-x11 +Suggests: gnupg, gnupg-agent, pinentry-tqt | pinentry-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer, procmail Provides: imap-client, mail-reader Description: Trinity Email client KMail is a fully-featured email client that fits nicely into the TDE -- cgit v1.2.3