[SCM] Amarok packaging branch, master, updated. debian/2.8.0-4-4-g7bfaaa8

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7bfaaa85e84632ae9cb8426f1cee643a7927787a
Merge: 9ffeb043026974df40dd9f7207265296ca59a42b ec1206a9bdf77e981accdea0fd357797f2e5b36b
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Apr 4 09:17:52 2016 +0200

    Merge nmu 2.8.0-4.1

 debian/changelog | 11 +++++++++++
 debian/control   |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index a4d9946,b15f257..54df22c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,22 @@@
 +amarok (2.8.0-5) UNRELEASED; urgency=medium
 +
 +  [ Pino Toscano ]
 +  * Drop menu file and its pixmaps, since amarok already provides a .desktop
 +    file.
 +
 + -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 24 Jan 2016 16:19:34 +0100
 +
+ amarok (2.8.0-4.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * debian/control:
+     - Update to Debian Policy 3.9.7.
+     - Build-Depends-Indep: Change build dependency from mysql-server-core to
+       virtual-mysql-server-core to allow mariadb usage (closes: #815567).
+ 
+  -- Samuel Henrique Oltramari Pinto (SamuelOPH) <samueloph at gmail.com>  Sun, 27 Mar 2016 12:43:01 -0300
++>>>>>>> nmu
+ 
  amarok (2.8.0-4) unstable; urgency=medium
  
    * Update watch file.

-- 
Amarok packaging