[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=521445d

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

    enable gpodder.net support (#655362)
    
    ... now that libmygpo-qt is in Debian
    
    add libmygpo-qt-dev B-D; update install files
---
 debian/amarok-common.install | 2 ++
 debian/amarok.install        | 2 ++
 debian/changelog             | 5 +++++
 debian/control               | 3 ++-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/amarok-common.install b/debian/amarok-common.install
index 7a51549..cb156d5 100644
--- a/debian/amarok-common.install
+++ b/debian/amarok-common.install
@@ -65,6 +65,8 @@ usr/share/kde4/services/amarok_service_amazonstore.desktop
 usr/share/kde4/services/amarok_service_amazonstore_config.desktop
 usr/share/kde4/services/amarok_service_ampache.desktop
 usr/share/kde4/services/amarok_service_ampache_config.desktop
+usr/share/kde4/services/amarok_service_gpodder.desktop
+usr/share/kde4/services/amarok_service_gpodder_config.desktop
 usr/share/kde4/services/amarok_service_jamendo.desktop
 usr/share/kde4/services/amarok_service_lastfm.desktop
 usr/share/kde4/services/amarok_service_lastfm_config.desktop
diff --git a/debian/amarok.install b/debian/amarok.install
index b0db1fb..d7bc085 100644
--- a/debian/amarok.install
+++ b/debian/amarok.install
@@ -33,6 +33,7 @@ usr/lib/kde4/amarok_data_engine_upcomingEvents.so
 usr/lib/kde4/amarok_data_engine_wikipedia.so
 usr/lib/kde4/amarok_service_amazonstore.so
 usr/lib/kde4/amarok_service_ampache.so
+usr/lib/kde4/amarok_service_gpodder.so
 usr/lib/kde4/amarok_service_jamendo.so
 usr/lib/kde4/amarok_service_lastfm.so
 usr/lib/kde4/amarok_service_magnatunestore.so
@@ -40,6 +41,7 @@ usr/lib/kde4/amarok_service_mp3tunes.so
 usr/lib/kde4/amarok_service_opmldirectory.so
 usr/lib/kde4/kcm_amarok_service_amazonstore.so
 usr/lib/kde4/kcm_amarok_service_ampache.so
+usr/lib/kde4/kcm_amarok_service_gpodder.so
 usr/lib/kde4/kcm_amarok_service_lastfm.so
 usr/lib/kde4/kcm_amarok_service_magnatunestore.so
 usr/lib/kde4/kcm_amarok_service_mp3tunes.so
diff --git a/debian/changelog b/debian/changelog
index 71f4182..c9ff652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,11 @@ amarok (2.8.0-7) UNRELEASED; urgency=medium
       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)
+  * Enable the gpodder.net support, now that libmygpo-qt is in Debian:
+    (Closes: #655362)
+    - add the libmygpo-qt-dev >= 1.0.9-2~ build dependency, with the version
+      required because of #838229
+    - update install files
 
  -- 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 3b2196c..bee7deb 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  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
+ libgcrypt20-dev,
+ libmygpo-qt-dev (>= 1.0.9-2~),
 Build-Depends-Indep: default-mysql-server-core | virtual-mysql-server-core
 Standards-Version: 3.9.8
 Homepage: http://amarok.kde.org

-- 
Amarok packaging