diff options
8 files changed, 14 insertions, 14 deletions
diff --git a/debian/_base/core/tdepim/debian/control b/debian/_base/core/tdepim/debian/control index 66dba3bf3..48eff7e66 100644 --- a/debian/_base/core/tdepim/debian/control +++ b/debian/_base/core/tdepim/debian/control @@ -270,7 +270,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. @@ -283,8 +283,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 diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/control b/debian/_base/metapackages/redmond-default-settings-ii/debian/control index a5b85d56b..205ce5b88 100644 --- a/debian/_base/metapackages/redmond-default-settings-ii/debian/control +++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/control @@ -163,7 +163,7 @@ Recommends: firefox | iceweasel, libreoffice-impress, libreoffice-trinity, libreoffice-writer, - pinentry-qt, + pinentry-tqt | pinentry-qt | pinentry-x11, powernowd, printer-driver-pxljr | pxljr, rdesktop, diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control index 6a617a5c9..79cae6eda 100644 --- a/debian/_base/metapackages/redmond-default-settings/debian/control +++ b/debian/_base/metapackages/redmond-default-settings/debian/control @@ -163,7 +163,7 @@ Recommends: firefox | iceweasel, libreoffice-impress, libreoffice-trinity, libreoffice-writer, - pinentry-qt, + pinentry-tqt | pinentry-qt | pinentry-x11, powernowd, printer-driver-pxljr | pxljr, rdesktop, 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 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 diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all index b2b9ede86..0198d0cca 100644 --- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all +++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all @@ -79,7 +79,7 @@ linux-headers-generic make network-manager-tde | network-manager-gnome networkstatus-trinity -pinentry-qt +pinentry-tqt | pinentry-qt | pinentry-x11 plymouth-theme-kubuntu-logo-trinity powernowd printer-driver-c2esp |