[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=d2cd01c

The following commit has been merged in the master branch:
commit d2cd01c23d9e1ac67ec2d0ffea2c1a4eaeb5cce5
Author: Modestas Vainius <modax at debian.org>
Date:   Mon Jun 13 00:43:40 2011 +0300

    Sigh, fix typo in kde-l10n Conflicts for kdepim-runtime.
---
 debian/control |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index c15cb98..f7d0c7b 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, kdepimlibs-kio-plugins, akonadi-server (>= 1.3)
 Replaces: akonadi-kde, libmaildir4
 Breaks: akonadi-kde, libmaildir4, kdepimlibs5 (<< 4:4.4)
-Conflicts: kdepim-l10n, kdepim-l10n-nopim
+Conflicts: kde-l10n, kde-l10n-nopim
 Description: Runtime components for akonadi-kde
  This package contains akonadi agents written using kdelibs.
  Any package that uses akonadi should probably pull this in as a dependency.

-- 
KDE PIM Runtime module packaging