[SCM] Amarok packaging branch, master, updated. debian/2.4.2-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit eb4d6b26a9ef7e19234a4be64da74942a7aa875c
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jul 24 08:58:43 2011 +0300

    Drop amarok-engine-xine and amarok-engine-yauap from amarok Conflicts.
    
    They are no longer relevant for stable and trigger lintian messages.
---
 debian/changelog |    2 ++
 debian/control   |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ee9ede9..d64ea6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ amarok (2.4.2-0r3) UNRELEASED; urgency=low
   * Backport a patch to fix a bug which caused KWallet to prompt for a password
     on every track change (backport_no_kwallet_prompt_on_track_change.patch).
   * Override lintian "amarok: no-symbols-control-file".
+  * Drop amarok-engine-xine (<< 2) and amarok-engine-yauap (<< 2) from amarok
+    Conflicts. No longer relevant for stable.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 04 Jun 2011 20:38:34 +0300
 
diff --git a/debian/control b/debian/control
index e5c5a1b..7b3e397 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,6 @@ Depends: amarok-common (= ${source:Version}), amarok-utils (= ${binary:Version})
  libqtscript4-core, libqtscript4-gui, libqtscript4-network, libqtscript4-xml, libqtscript4-sql, libqtscript4-uitools
 Recommends: kdemultimedia-kio-plugins (>= 4:4.2.0)
 Suggests: libxine1-ffmpeg, libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-sql-psql, moodbar
-Conflicts: amarok-engine-xine (<< 2), amarok-engine-yauap (<< 2)
 Description: easy to use media player based on the KDE Platform
  Amarok is a powerful music player with an intuitive interface. It makes
  playing the music you love and discovering new music easier than ever before

-- 
Amarok packaging