TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB: updated relevant modules to use pinentry-tqt if available.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/70/head
Michele Calgaro 4 years ago
parent f6a8f30d70
commit 65934e6248
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

6
debian/_base/core/tdepim/debian/control vendored
Unescape View File

@ -255,7 +255,7 @@ Section: net
Architecture: any Architecture: any
Replaces: kleopatra-trinity (<< 4:14.0.0~) Replaces: kleopatra-trinity (<< 4:14.0.0~)
Breaks: 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 Description: Trinity Certificate Manager
Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
keybox and for retrieving certificates from LDAP servers. keybox and for retrieving certificates from LDAP servers.
@ -268,8 +268,8 @@ Section: mail
Architecture: any Architecture: any
Replaces: kmail-trinity (<< 4:14.0.0~) Replaces: kmail-trinity (<< 4:14.0.0~)
Breaks: 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 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-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer, procmail 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 Provides: imap-client, mail-reader
Description: Trinity Email client Description: Trinity Email client
KMail is a fully-featured email client that fits nicely into the TDE KMail is a fully-featured email client that fits nicely into the TDE

2
debian/_base/metapackages/redmond-default-settings-ii/debian/control vendored
Unescape View File

@ -163,7 +163,7 @@ Recommends: firefox | iceweasel,
libreoffice-impress, libreoffice-impress,
libreoffice-trinity, libreoffice-trinity,
libreoffice-writer, libreoffice-writer,
pinentry-qt, pinentry-tqt | pinentry-qt | pinentry-x11,
powernowd, powernowd,
printer-driver-pxljr | pxljr, printer-driver-pxljr | pxljr,
rdesktop, rdesktop,

2
debian/_base/metapackages/redmond-default-settings/debian/control vendored
Unescape View File

@ -163,7 +163,7 @@ Recommends: firefox | iceweasel,
libreoffice-impress, libreoffice-impress,
libreoffice-trinity, libreoffice-trinity,
libreoffice-writer, libreoffice-writer,
pinentry-qt, pinentry-tqt | pinentry-qt | pinentry-x11,
powernowd, powernowd,
printer-driver-pxljr | pxljr, printer-driver-pxljr | pxljr,
rdesktop, rdesktop,

2
dilos/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
Unescape View File

@ -12,7 +12,7 @@ remove clean:: rule
Control has networkstatus-dev package and networkstatus package includes Control has networkstatus-dev package and networkstatus package includes
libnetworkstatus.so* files libnetworkstatus.so* files
build-dep on gpgsm 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 add scalix support
remove debian/patches/30_debianize_akregator_default.diff remove debian/patches/30_debianize_akregator_default.diff

6
dilos/core/tdepim/debian/control
Unescape View File

@ -255,7 +255,7 @@ Section: net
Architecture: any Architecture: any
Replaces: kleopatra-trinity (<< 4:14.0.0~) Replaces: kleopatra-trinity (<< 4:14.0.0~)
Breaks: 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 Description: Trinity Certificate Manager
Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
keybox and for retrieving certificates from LDAP servers. keybox and for retrieving certificates from LDAP servers.
@ -268,8 +268,8 @@ Section: mail
Architecture: any Architecture: any
Replaces: kmail-trinity (<< 4:14.0.0~) Replaces: kmail-trinity (<< 4:14.0.0~)
Breaks: 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 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-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer, procmail 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 Provides: imap-client, mail-reader
Description: Trinity Email client Description: Trinity Email client
KMail is a fully-featured email client that fits nicely into the TDE KMail is a fully-featured email client that fits nicely into the TDE

2
ubuntu/_base/core/tdepim/debian/KUBUNTU-DEBIAN-DIFFERENCES
Unescape View File

@ -12,7 +12,7 @@ remove clean:: rule
Control has networkstatus-dev package and networkstatus package includes Control has networkstatus-dev package and networkstatus package includes
libnetworkstatus.so* files libnetworkstatus.so* files
build-dep on gpgsm 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 add scalix support
remove debian/patches/30_debianize_akregator_default.diff remove debian/patches/30_debianize_akregator_default.diff

6
ubuntu/_base/core/tdepim/debian/control
Unescape View File

@ -255,7 +255,7 @@ Section: net
Architecture: any Architecture: any
Replaces: kleopatra-kde3 (<< 4:14.0.0~), kleopatra-trinity (<< 4:14.0.0~) 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~) 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 Description: Trinity Certificate Manager
Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
keybox and for retrieving certificates from LDAP servers. keybox and for retrieving certificates from LDAP servers.
@ -268,8 +268,8 @@ Section: mail
Architecture: any Architecture: any
Replaces: kmail-kde3 (<< 4:14.0.0~), kmail-trinity (<< 4:14.0.0~) 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~) 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 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-qt | pinentry-x11, kaddressbook-trinity, kleopatra-trinity, spamassassin | bogofilter | annoyance-filter | spambayes | bsfilter | crm114, clamav | f-prot-installer, procmail 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 Provides: imap-client, mail-reader
Description: Trinity Email client Description: Trinity Email client
KMail is a fully-featured email client that fits nicely into the TDE KMail is a fully-featured email client that fits nicely into the TDE

2
ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
Unescape View File

@ -79,7 +79,7 @@ linux-headers-generic
make make
network-manager-tde | network-manager-gnome network-manager-tde | network-manager-gnome
networkstatus-trinity networkstatus-trinity
pinentry-qt pinentry-tqt | pinentry-qt | pinentry-x11
plymouth-theme-kubuntu-logo-trinity plymouth-theme-kubuntu-logo-trinity
powernowd powernowd
printer-driver-c2esp printer-driver-c2esp

Write Preview
Loading…
Cancel
Save