[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=0ca5df2

The following commit has been merged in the master branch:
commit 0ca5df22ab9dcec37d6f31519bcb2160139411e9
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 24 13:15:48 2012 +0300

    Drop Conflicts: kde-l10n, kde-l10n-nopim.
    
    They were never needed.
---
 debian/changelog |    1 -
 debian/control   |    1 -
 2 files changed, 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 48d5fd5..6c4028d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,6 @@ kdepim-runtime (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Require KDE SC 4.8.4 for building.
   * Update lintian overrides.
   * Drop extra Priority field from kdepim-runtime-dbg control.
-  * Add kde-l10n, kde-l10n-nopim to kdepim-runtime Conflicts.
   * Version kdepim-dbg Breaks/Replaces. Otherwise, kdepim-runtime-dbg is not
     co-installable with kdepim-dbg.
   * Drop debian_set_library_version.diff patch, not needed.
diff --git a/debian/control b/debian/control
index 643a7fc..30e3b74 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ 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: kde-l10n, kde-l10n-nopim
 Description: runtime components for Akonadi KDE
  This package contains Akonadi agents written using KDE Development Platform
  libraries.

-- 
KDE PIM Runtime module packaging