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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 802f02157cb5d6f680308374f00135f512a55250
Author: Pino Toscano <pino at debian.org>
Date:   Thu Apr 4 13:15:28 2013 +0200

    kdelibs-bin: conflict with kdelibs4c2a (#704669)
    
    now it provides kmailservice/ktelnetservice in /usr/bin
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 73ae840..76abc29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ kde4libs (4:4.10.2-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Backport upstream commit a4dd84f42abea1ff9cdd15e156c63776c0bf854b to fix
     building on Hurd; patch upstream_Remove-extra-sys-mount.h-include.patch.
+  * Make kdelibs-bin conflict with kdelibs4c2a, since now it provides
+    kmailservice/ktelnetservice in /usr/bin. (Closes: #704669)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Apr 2013 20:15:12 +0200
 
diff --git a/debian/control b/debian/control
index 95ff788..8c00b62 100644
--- a/debian/control
+++ b/debian/control
@@ -470,7 +470,7 @@ Description: declarative library for plasma
 Package: kdelibs-bin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: kjscmd
+Conflicts: kjscmd, kdelibs4c2a
 Description: core executables for KDE Applications
  This package contains common core executables used by all KDE Applications.
  .

-- 
KDE Development Platform Libraries module packaging