summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-11-29 17:50:40 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-11-29 17:50:40 +0900
commit65934e624857ba5f1849be9eec9a341e84c34d0a (patch)
treecc9c8b798bc8185d6195c5745c457c5d35080508 /ubuntu/_base/core
parentf6a8f30d70139a1fda227768d61a717a6d671389 (diff)
downloadtde-packaging-65934e624857ba5f1849be9eec9a341e84c34d0a.tar.gz
tde-packaging-65934e624857ba5f1849be9eec9a341e84c34d0a.zip
DEB: updated relevant modules to use pinentry-tqt if available.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'ubuntu/_base/core')
-rw-r--r--ubuntu/_base/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES2
-rw-r--r--ubuntu/_base/core/tdepim/debian/control6
2 files changed, 4 insertions, 4 deletions
diff --git a/ubuntu/_base/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES b/ubuntu/_base/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
index 44104bc40..b370a3cbf 100644
--- a/ubuntu/_base/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/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/ubuntu/_base/core/tdepim/debian/control b/ubuntu/_base/core/tdepim/debian/control
index a1878dd6a..09fccf44d 100644
--- a/ubuntu/_base/core/tdepim/debian/control
+++ b/ubuntu/_base/core/tdepim/debian/control
@@ -255,7 +255,7 @@ Section: net
Architecture: any
Replaces: kleopatra-kde3 (<< 4:14.0.0~), kleopatra-trinity (<< 4:14.0.0~)
Breaks: kleopatra-kde3 (<< 4:14.0.0~), 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-kde3 (<< 4:14.0.0~), kmail-trinity (<< 4:14.0.0~)
Breaks: kmail-kde3 (<< 4:14.0.0~), 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