[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1

Maximiliano Curia maxy at alioth.debian.org
Thu Jul 11 15:27:31 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=3266ff4

The following commit has been merged in the master branch:
commit 3266ff494167daa2967b172019da1b69cc5ebe9d
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri May 10 14:13:10 2013 +0200

    Use SSL/TLS certificates bundle from ca-certificates package.
---
 debian/changelog             |    2 ++
 debian/control               |    2 +-
 debian/kdelibs5-data.install |    1 -
 debian/kdelibs5-data.links   |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8117cc3..ab9da25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ kde4libs (4:4.10.3-1) UNRELEASED; urgency=low
   * Update symbols, add new symbols:
     - libkdecore5.symbols
     - libktexteditor4.symbols
+  * Use SSL/TLS certificates bundle from ca-certificates package, thanks to
+    Thijs Kinkhorst <thijs at debian.org>. (Closes: #511597)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 09 May 2013 18:49:01 +0200
 
diff --git a/debian/control b/debian/control
index ca6f6d2..b69316c 100644
--- a/debian/control
+++ b/debian/control
@@ -492,7 +492,7 @@ Description: core plugins for KDE Applications
 
 Package: kdelibs5-data
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, hicolor-icon-theme
+Depends: ${perl:Depends}, ${misc:Depends}, hicolor-icon-theme, ca-certificates
 Replaces: libplasma2, kdebase-runtime-data (<< 4:4.5.85)
 Breaks: libplasma2, kdebase-runtime-data (<< 4:4.5.85)
 Description: core shared data for all KDE Applications
diff --git a/debian/kdelibs5-data.install b/debian/kdelibs5-data.install
index e51de40..474634f 100644
--- a/debian/kdelibs5-data.install
+++ b/debian/kdelibs5-data.install
@@ -188,7 +188,6 @@ usr/share/kde4/apps/kjava/pluginsinfo
 usr/share/kde4/apps/knewstuff/pics/ghns_star.png
 usr/share/kde4/apps/knewstuff/pics/ghns_star_gray.png
 usr/share/kde4/apps/knewstuff/pics/thumb_frame.png
-usr/share/kde4/apps/kssl/ca-bundle.crt
 usr/share/kde4/apps/plasma/services/dataengineservice.operations
 usr/share/kde4/apps/plasma/services/plasmoidservice.operations
 usr/share/kde4/apps/plasma/services/storage.operations
diff --git a/debian/kdelibs5-data.links b/debian/kdelibs5-data.links
new file mode 100644
index 0000000..9b0767a
--- /dev/null
+++ b/debian/kdelibs5-data.links
@@ -0,0 +1 @@
+/etc/ssl/certs/ca-certificates.crt usr/share/kde4/apps/kssl/ca-bundle.crt

-- 
KDE Development Platform Libraries module packaging



More information about the pkg-kde-commits mailing list