[SCM] Amarok packaging branch, master, updated. debian/2.6-beta1+75.g47e75df-1

[Modestas Vainius]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=1aa11ce

The following commit has been merged in the master branch:
commit 1aa11ce86537ab4aa8b0fd09a9ebf4ea66786b1d
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Jun 29 02:23:13 2012 +0300

    Drop libxine1-ffmpeg from amarok Suggests.
    
    It is no longer relevant as there is no Phonon Xine backend anymore.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fee3345..8ac540b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ amarok (2.6~beta1+75.g47e75df-0r1) UNRELEASED; urgency=low
   * Override lintian embedded-library: zlib error. It comes from MySQLe.
   * Drop "upgrading from 1.4" and "upgrading to 2.2" sections from
     README.Debian. They are no longer relevant.
+  * Drop libxine1-ffmpeg from amarok Suggests. It is no longer relevant as
+    there is no Phonon Xine backend anymore.
 
  -- Modestas Vainius <modax at debian.org>  Fri, 29 Jun 2012 01:50:42 +0300
 
diff --git a/debian/control b/debian/control
index fbce6d3..262ef86 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: amarok-common (= ${source:Version}), amarok-utils (= ${binary:Version})
  ${shlibs:Depends}, ${misc:Depends},
  libqtscript4-core, libqtscript4-gui, libqtscript4-network, libqtscript4-xml, libqtscript4-sql, libqtscript4-uitools
 Recommends: kdemultimedia-kio-plugins (>= 4:4.2.0)
-Suggests: amarok-doc (>= ${source:Version}), libxine1-ffmpeg, libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-sql-psql,
+Suggests: amarok-doc (>= ${source:Version}), libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-sql-psql,
  moodbar
 Description: easy to use media player based on the KDE Platform
  Amarok is a powerful music player with an intuitive interface. It makes

-- 
Amarok packaging