[SCM] okular packaging branch, master, updated. debian/15.12.1-1-21-g17d71cc

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/okular.git;a=commitdiff;h=0546c95

The following commit has been merged in the master branch:
commit 0546c955b782b45a88b5b495b129d079221020e7
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Apr 13 12:00:59 2016 +0200

    Refresh patches
---
 debian/patches/temporarily_disable_failing_test | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/patches/temporarily_disable_failing_test b/debian/patches/temporarily_disable_failing_test
index ce79aa2..701571c 100644
--- a/debian/patches/temporarily_disable_failing_test
+++ b/debian/patches/temporarily_disable_failing_test
@@ -1,8 +1,17 @@
-Index: okular/tests/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 12:00:52 +0200
+Subject: temporarily_disable_failing_test
+
 ===================================================================
---- okular.orig/tests/CMakeLists.txt	2014-08-24 19:04:48.079064107 +0200
-+++ okular/tests/CMakeLists.txt	2014-08-24 19:55:10.260342030 +0200
-@@ -35,5 +35,5 @@
+---
+ tests/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 7fdd0be..495c720 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -35,5 +35,5 @@ target_link_libraries( modifyannotationpropertiestest ${KDE4_KDECORE_LIBS} ${QT_
  kde4_add_unit_test( editformstest editformstest.cpp )
  target_link_libraries( editformstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
  

-- 
okular packaging