[SCM] Amarok packaging branch, master, updated. debian/2.5.0-1-11-g4680f74

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit f0ec6f231a93a1e77b01c37e3f36347a7b56ba3d
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 19 22:20:02 2012 +0300

    Drop mysql-server-5.1 from Build-Depends-Indep.
    
    mysql-server-core-5.1 was split off long ago (it's in squeeze).
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f7e36a..b8aa6d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 amarok (2.5.0-2~pre1) UNRELEASED; urgency=low
 
+  * Drop mysql-server-5.1 from Build-Depends-Indep. mysql-server-core-5.1 was
+    split off long ago (it's in squeeze).
 
  -- Modestas Vainius <modax at debian.org>  Sat, 19 May 2012 22:16:23 +0300
 
diff --git a/debian/control b/debian/control
index 53bccfe..f5dce8a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 8.9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  libqt4-opengl-dev, libcurl4-gnutls-dev, libxml2-dev, libloudmouth1-dev,
  libgtk2.0-dev, kdemultimedia-dev (>= 4:4.2.0), libqca2-dev, liblastfm-dev (>= 0.3),
  libavformat-dev (>= 4:0.5), libofa0-dev
-Build-Depends-Indep: mysql-server-core-5.1 | mysql-server-5.1
+Build-Depends-Indep: mysql-server-core-5.1
 Standards-Version: 3.9.2
 Homepage: http://amarok.kde.org
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/amarok.git

-- 
Amarok packaging