[SCM] KDE PIM Runtime module packaging branch, experimental, updated. debian/4.4.11.1-2-26-gb9b5b51

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit b9b5b51ed92616733281e56a587c64ea987f6019
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 12 16:46:59 2011 +0300

    Add kde-l10n, kde-l10n-nopim to kdepim-runtime Conflicts.
---
 debian/changelog |    1 +
 debian/control   |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a3f211b..55e44ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ kdepim-runtime (4:4.6.0-0r1) UNRELEASED; urgency=low
   * Drop extra Priority field from kdepim-runtime-dbg control.
   * Extend kdepim-runtime-dbg description.
   * Capitalize KDE in package descriptions.
+  * Add kde-l10n, kde-l10n-nopim to kdepim-runtime Conflicts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 04 Sep 2010 23:13:11 +0300
 
diff --git a/debian/control b/debian/control
index 219cd56..c15cb98 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +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
 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