[SCM] Amarok packaging branch, master, updated. debian/2.8.0-2-5-g74c279f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b018c2f5439cb7fea0d726d4133ab6da22d49802
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Aug 30 10:37:41 2014 +0200

    Imported Debian patch 2.8.0-2.1
---
 debian/changelog            | 8 ++++++++
 debian/control              | 3 ++-
 debian/source/local-options | 2 --
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 020f66c..38b830e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+amarok (2.8.0-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: Explicitly list libgcrypt20-dev in Build-Depends (Closes:
+    #758412).
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Sat, 30 Aug 2014 10:37:41 +0200
+
 amarok (2.8.0-2) unstable; urgency=low
 
   * Drop kdemultimedia-dev build dependency. Apparently, it is not needed.
diff --git a/debian/control b/debian/control
index 3e837a0..c688acc 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,8 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  libmysqld-pic (>= 5.5.23+dfsg), 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]
+ libavformat-dev (>= 4:0.5), libofa0-dev, libaio-dev [linux-any],
+ libgcrypt20-dev
 Build-Depends-Indep: mysql-server-core-5.5 | mysql-server-core
 Standards-Version: 3.9.5
 Homepage: http://amarok.kde.org
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 9cdfca9..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1,2 +0,0 @@
-unapply-patches
-abort-on-upstream-changes

-- 
Amarok packaging