summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdelibs
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-07-24 20:49:38 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-07-24 20:49:38 +0200
commit400dd73349695d15f67e4e145f42893026cb3ab9 (patch)
tree1e525af297809fa6a6ba360da059a9504231c711 /ubuntu/maverick/tdelibs
parent4f411154e747b655fce18f115d0d893040c618fc (diff)
parent82fe514bc8a3d0ae6824e8bffce19616e5600540 (diff)
downloadtde-packaging-400dd73349695d15f67e4e145f42893026cb3ab9.tar.gz
tde-packaging-400dd73349695d15f67e4e145f42893026cb3ab9.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/tdelibs')
-rw-r--r--ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install1
-rw-r--r--ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links1
2 files changed, 1 insertions, 1 deletions
diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
index dc0365e10..d59d33605 100644
--- a/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.install
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-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/tdelibs/debian/tdelibs-data-trinity.links b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links
new file mode 100644
index 000000000..a94119055
--- /dev/null
+++ b/ubuntu/maverick/tdelibs/debian/tdelibs-data-trinity.links
@@ -0,0 +1 @@
+/etc/ssl/certs/ca-certificates.crt debian/tmp/opt/trinity/share/apps/kssl/ca-bundle.crt