[SCM] KDE Multimedia module packaging branch, master, updated. debian/4.8.4-2-2-g5290540

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 52905400243aa8173cc4d86bde1591280ea1e4fd
Author: Pino Toscano <pino at debian.org>
Date:   Mon Oct 29 12:01:30 2012 +0100

    kdemultimedia-dev: fix "kxim" (= "kmix") typo in breaks/replaces
---
 debian/changelog |    2 ++
 debian/control   |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4e2957..b2ed485 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdemultimedia (4:4.8.4-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix "kxim" (= "kmix") typo in breaks/replaces of kdemultimedia-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Oct 2012 11:59:57 +0100
 
diff --git a/debian/control b/debian/control
index b4c2c6b..bc4dcbd 100644
--- a/debian/control
+++ b/debian/control
@@ -168,8 +168,8 @@ Architecture: any
 Depends: ${sameVersionDep:kdelibs5-dev:kdemultimedia-kio-plugins},
  ${misc:Depends}, libkcddb-dev (= ${binary:Version}),
  kdemultimedia-kio-plugins (= ${binary:Version})
-Replaces: juk (<< 4:4.1.80), kscd (<< 4:4.1.80), kxim (<< 4:4.1.80)
-Breaks: juk (<< 4:4.1.80), kscd (<< 4:4.1.80), kxim (<< 4:4.1.80)
+Replaces: juk (<< 4:4.1.80), kscd (<< 4:4.1.80), kmix (<< 4:4.1.80)
+Breaks: juk (<< 4:4.1.80), kscd (<< 4:4.1.80), kmix (<< 4:4.1.80)
 Description: development files for the KDE multimedia module
  This package contains development files for building software that uses
  libraries from the KDE multimedia module.

-- 
KDE Multimedia module packaging