[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=b40fd5c

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

    Prefer mysql-server-core-5.5 in Build-Depends-Indep.
    
    What is more, alternatively depend on the mysql-server-core virtual package.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b8aa6d4..6300a63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ 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).
+  * Prefer mysql-server-core-5.5 in Build-Depends-Indep. Alternatively depend
+    on the mysql-server-core virtual package.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 19 May 2012 22:16:23 +0300
 
diff --git a/debian/control b/debian/control
index f5dce8a..2770025 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
+Build-Depends-Indep: mysql-server-core-5.5 | mysql-server-core
 Standards-Version: 3.9.2
 Homepage: http://amarok.kde.org
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/amarok.git
diff --git a/debian/rules b/debian/rules
index ef58a5a..8f112d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ override_dh_bugfiles:
 
 override_dh_install:
 	dh_install
-	# Copy English errmsg.sys from mysql-server package
+	# Copy English errmsg.sys from mysql-server-core package
 	if [ -d debian/amarok-common ]; then \
 	    cp -a /usr/share/mysql/english/errmsg.sys debian/amarok-common/usr/share/kde4/apps/amarok/mysqle/; \
 	fi

-- 
Amarok packaging