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

[Andrey Rahmatullin]

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

The following commit has been merged in the master branch:
commit ad07e322956479c280d7b18ac01bb81f7c31a27f
Author: Andrey Rahmatullin <wrar at debian.org>
Date:   Fri Dec 2 00:14:47 2016 +0500

    Fix TagLib version check.
---
 .../backport_fix_taglib_version_check.patch        | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/backport_fix_taglib_version_check.patch b/debian/patches/backport_fix_taglib_version_check.patch
new file mode 100644
index 0000000..12dcce8
--- /dev/null
+++ b/debian/patches/backport_fix_taglib_version_check.patch
@@ -0,0 +1,36 @@
+Description: Fix TagLib version check.
+ The version check compared version strings lexicographically, so "1.7"
+ (the min version) compared as greater than "1.10.0".
+Author: Omar Plummer <omarplummer at imergetechnologies.com>
+Origin: upstream, commit:fec8817c530ce42b6485fdabff6051784b8d9904
+Bug: http://bugs.kde.org/351013
+Bug-Debian: https://bugs.debian.org/841134
+Applied-Upstream: yes
+Last-Update: 2016-12-01
+
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..f485a42 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+      message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+      set(TAGLIB_FOUND FALSE)
+-  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++  else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ 
+      exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -42,7 +42,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         set(TAGLIB_FOUND TRUE)
+      endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+      string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++  endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)
diff --git a/debian/patches/series b/debian/patches/series
index bb70fb0..b624192 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ debian_find_mysql_fix.diff
 debian_clamz_is_runtime_dependency.diff
 valgrind_uninitialized_value
 ffmpeg_2.9.patch
+backport_fix_taglib_version_check.patch

-- 
Amarok packaging