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

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit 381e481c50529f8d1be1f349d1e0183c17abec2e
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Aug 18 12:29:43 2013 +0300

    Adapt debian_clamz_is_runtime_dependency.diff to upstream changes.
---
 debian/changelog                                       |    1 +
 debian/patches/debian_clamz_is_runtime_dependency.diff |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39df3d0..fa97f70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ amarok (2.8.0-0r1) UNRELEASED; urgency=low
   * Build depend on nepomuk-core-dev for KDE 4.9 or higher.
   * Adapt debian_disable_qtscriptbindings_check_fix.diff to upstream changes.
   * Adapt debian_find_mysql_fix.diff to upstream changes.
+  * Adapt debian_clamz_is_runtime_dependency.diff to upstream changes.
 
   [ Maximiliano Curia ]
   * Update watch file.
diff --git a/debian/patches/debian_clamz_is_runtime_dependency.diff b/debian/patches/debian_clamz_is_runtime_dependency.diff
index 87fc699..851b499 100644
--- a/debian/patches/debian_clamz_is_runtime_dependency.diff
+++ b/debian/patches/debian_clamz_is_runtime_dependency.diff
@@ -7,13 +7,13 @@ 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 )
+@@ -213,9 +213,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 )
+     include_directories( ${KDE4_INCLUDES} )
+ 
+     if( KDE4_BUILD_TESTS AND NOT WIN32 )

-- 
Amarok packaging