[SCM] kaffeine packaging branch, master, updated. debian/1.2.2-3-10-g4cd145f

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 33dc7801a4575d5df75ad496b3f9044b234abc61
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jun 7 15:47:26 2016 +0200

    refresh patches
---
 .../upstream_Explicitly-include-CheckIncludeFiles.patch       | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch b/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch
index 5b21485..aa67461 100644
--- a/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch
+++ b/debian/patches/upstream_Explicitly-include-CheckIncludeFiles.patch
@@ -9,18 +9,13 @@ and implicitly relying on CheckIncludeFiles being included.
  CMakeLists.txt | 1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d9be8db..b74b44d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -21,6 +21,7 @@ if(STRICT_BUILD)
-                   -DQT_NO_URL_CAST_FROM_STRING -DQT_STRICT_ITERATORS)
- endif(STRICT_BUILD)
+@@ -11,6 +11,7 @@ if(DEFINED QT_VERSION_MAJOR)
+   add_definitions(-DQT_STRICT_ITERATORS)
+ endif(DEFINED QT_VERSION_MAJOR)
  
 +include(CheckIncludeFiles)
  check_include_files(${CMAKE_CURRENT_SOURCE_DIR}/include/frontend.h HAVE_DVB)
  
  if(NOT HAVE_DVB)
--- 
-2.8.1
-

-- 
kaffeine packaging