[SCM] Amarok packaging branch, experimental, updated. debian/2.7.0-1

[Modestas Vainius]

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

The following commit has been merged in the experimental branch:
commit 128f05efc61fd2128cf476e56a3b196d3262135d
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jan 27 13:45:01 2013 +0200

    Add support for clamz.
    
    Add it to amarok Recommends, add README.Debian entry about it and disable its
    check at build time (patch debian_clamz_is_runtime_dependency.diff)
---
 debian/README.Debian                               |    3 ++-
 debian/changelog                                   |    3 +++
 debian/control                                     |    2 +-
 .../debian_clamz_is_runtime_dependency.diff        |   19 +++++++++++++++++++
 debian/patches/series                              |    1 +
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 63ce982..d112239 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -12,4 +12,5 @@ General notes
 * In order to use moodbar support in Amarok, you will have to manually generate
   "mood" files for your tracks and to enable moodbar in Amarok preferences.
   Refer to http://amarok.kde.org/wiki/Moodbar#Usage for more information.
-
+* As of 2.7.0, you should install clamz package if you wish to download songs
+  from Amazon with Amarok.
diff --git a/debian/changelog b/debian/changelog
index 70ad8fb..bb96268 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ amarok (2.7.0-0r1) UNRELEASED; urgency=low
     - require kde4libs 4.8.4 (with implicit Qt 4.8 requirement);
     - require taglib 1.8;
     - require liblastfm 1.0.3.
+  * Add clamz to amarok Recommends and disable clamz check at build time
+    (patch debian_clamz_is_runtime_dependency.diff). In addition, add
+    README.Debian entry about clamz.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 18 Aug 2012 16:19:58 +0300
 
diff --git a/debian/control b/debian/control
index 4f905ec..9994091 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Architecture: any
 Depends: amarok-common (= ${source:Version}), amarok-utils (= ${binary:Version}),
  ${shlibs:Depends}, ${misc:Depends},
  libqtscript4-core, libqtscript4-gui, libqtscript4-network, libqtscript4-xml, libqtscript4-sql, libqtscript4-uitools
-Recommends: kdemultimedia-kio-plugins (>= 4:4.2.0)
+Recommends: kdemultimedia-kio-plugins (>= 4:4.2.0), clamz
 Suggests: amarok-doc (>= ${source:Version}), libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-sql-psql,
  moodbar
 Description: easy to use media player based on the KDE Platform
diff --git a/debian/patches/debian_clamz_is_runtime_dependency.diff b/debian/patches/debian_clamz_is_runtime_dependency.diff
new file mode 100644
index 0000000..87fc699
--- /dev/null
+++ b/debian/patches/debian_clamz_is_runtime_dependency.diff
@@ -0,0 +1,19 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Do not check for clamz at build-time
+Forwarded: not-needed
+Origin: vendor
+Last-Update: 2013-01-17
+
+Clamz is a runtime dependency. There is no need to check for it at build time.
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,9 +195,6 @@ if( WITH_PLAYER )
+     macro_log_feature( GLIB2_FOUND "glib2" "Required by libgpod and mp3tunes" "http://www.gtk.org" FALSE "2.x" "")
+     endif( WITH_IPOD OR WITH_MP3Tunes )
+ 
+-    find_program( CLAMZ_FOUND clamz PATH )
+-    macro_log_feature( CLAMZ_FOUND "clamz" "Optional requirement to download songs from the Amazon MP3 store. Highly recommended on Linux, as the official downloader from Amazon is quite broken on many systems." "https://code.google.com/p/clamz/" FALSE )
+-
+     string( TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER )
+     if( CMAKE_BUILD_TYPE_TOLOWER MATCHES debug )
+         set( DEBUG_BUILD_TYPE ON )
diff --git a/debian/patches/series b/debian/patches/series
index 2f8fb5b..412be6b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff
 debian_find_mysql_fix.diff
+debian_clamz_is_runtime_dependency.diff

-- 
Amarok packaging