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:51:34 +0900
commit3b16d50f3682e2b90c4c82e11c12a81cc01d45c6 (patch)
tree5b8ec0a63da3b8f8cdb04d06cbc247fddff6e975 /ubuntu/_base/core
parentb41db7f878f36ba56fe3b2b61127b266b20499e9 (diff)
downloadtde-packaging-3b16d50f3682e2b90c4c82e11c12a81cc01d45c6.tar.gz
tde-packaging-3b16d50f3682e2b90c4c82e11c12a81cc01d45c6.zip
DEB: updated relevant modules to use pinentry-tqt if available.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 65934e624857ba5f1849be9eec9a341e84c34d0a)
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 1a164878c..442908522 100644
--- a/ubuntu/_base/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
+++ b/ubuntu/_base/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
@@ -14,7 +14,7 @@ tdepim-dev does not depend on kitchensync
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 634b4922f..ba51a274d 100644
--- a/ubuntu/_base/core/tdepim/debian/control
+++ b/ubuntu/_base/core/tdepim/debian/control
@@ -270,7 +270,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.
@@ -283,8 +283,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