[SCM] Amarok packaging branch, master, updated. debian/2.8.0-6-5-g4225de2

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit b1aa97de6663346c6fc2d9e277367790fa1da682
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 23 15:18:13 2016 +0100

    switch to default Debian MySQL (#815567, #845798)
    
    - replace libmysqld-pic B-D with default-libmysqlclient-dev
    - replace mysql-server-core-5.6 B-D alternative with
      default-mysql-server-core
---
 debian/changelog | 7 +++++++
 debian/control   | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69c6f14..71f4182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,12 @@
 amarok (2.8.0-7) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Switch to the default MySQL implementation in Debian:
+    - replace the libmysqld-pic build dependency with libmariadbd-dev; while
+      it represents the current default MySQL version, in reality something
+      like default-mysqld-dev would be needed (Closes: #845798)
+    - replace the mysql-server-core-5.6 build dependency alternative with
+      default-mysql-server-core (Closes: #815567)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 23 Dec 2016 15:00:55 +0100
 
diff --git a/debian/control b/debian/control
index dd27602..3b2196c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,12 +11,13 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  kdelibs5-dev (>= 4:4.8.4),
  libmtp-dev (>= 1.0.0), libqjson-dev,
  libglib2.0-dev, libgpod-nogtk-dev (>= 0.7.0) | libgpod-dev (>= 0.7.0),
- libmysqld-pic (>= 5.5.23+dfsg), libwrap0-dev,
+ libmariadbd-dev,
+ libwrap0-dev,
  libcurl4-gnutls-dev, libxml2-dev, libloudmouth1-dev,
  libgtk2.0-dev, libqca2-dev, liblastfm-dev (>= 1.0.3),
  libavformat-dev (>= 4:0.5), libofa0-dev, libaio-dev [linux-any],
  libgcrypt20-dev
-Build-Depends-Indep: mysql-server-core-5.6 | virtual-mysql-server-core
+Build-Depends-Indep: default-mysql-server-core | virtual-mysql-server-core
 Standards-Version: 3.9.8
 Homepage: http://amarok.kde.org
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/amarok.git

-- 
Amarok packaging