diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-07-24 12:11:19 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-12-23 02:23:26 +0100 |
| commit | 0788bca4d20e330380e6bede35d3eaacc927f88a (patch) | |
| tree | 24bb7c06d457e89a2bcda576991cdff972b507be | |
| parent | 912d7b24ba768ed5937f0b4da82a69fbdec3afd6 (diff) | |
| download | tde-packaging-0788bca4d20e330380e6bede35d3eaacc927f88a.tar.gz tde-packaging-0788bca4d20e330380e6bede35d3eaacc927f88a.zip | |
Use system CA certificate bundle instead of local TDE version on Debian and Ubuntu systems
This resolves Bug 1106
(cherry picked from commit 82fe514bc8a3d0ae6824e8bffce19616e5600540)
6 files changed, 3 insertions, 3 deletions
diff --git a/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install index c85d01033..fbe162fd0 100644 --- a/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install +++ b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/debian/lenny/kdelibs/debian/kdelibs-data-trinity.links b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/debian/lenny/kdelibs/debian/kdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install b/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install index c85d01033..fbe162fd0 100644 --- a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install +++ b/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.links b/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/debian/squeeze/kdelibs/debian/kdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install b/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install index c85d01033..fbe162fd0 100644 --- a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install +++ b/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.install @@ -1665,7 +1665,6 @@ debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/README debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/TODO debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/VERSION debian/tmp/opt/trinity/share/apps/ksgmltools2/docbook/xsl/WhatsNew -debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown_down.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowdown.png debian/tmp/opt/trinity/share/apps/kstyle/pixmaps/riscos/arrowleft_down.png diff --git a/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.links b/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.links new file mode 100644 index 000000000..a94119055 --- /dev/null +++ b/ubuntu/maverick/kdelibs/debian/kdelibs-data-trinity.links @@ -0,0 +1 @@ +/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt |