[SCM] okular packaging branch, master, updated. debian/4.12.4-1-10-gc70388f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d143b10e6ddb0fe0481a22fd0fce418af0edd512
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri May 23 16:20:43 2014 +0200

    New patch: no_xrandr_support_on_xvfb.patch
---
 debian/changelog                               |  1 +
 debian/patches/no_xrandr_support_on_xvfb.patch | 15 +++++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f3933a2..7d97f25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ okular (4:4.13.1-1~) UNRELEASED; urgency=medium
   * New upstream release.
   * Update build dependencies.
   * Follow upstream soversion bump of okularcore.
+  * New patch: no_xrandr_support_on_xvfb.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 23 May 2014 13:29:52 +0200
 
diff --git a/debian/patches/no_xrandr_support_on_xvfb.patch b/debian/patches/no_xrandr_support_on_xvfb.patch
new file mode 100644
index 0000000..1d0d518
--- /dev/null
+++ b/debian/patches/no_xrandr_support_on_xvfb.patch
@@ -0,0 +1,15 @@
+Index: okular/tests/CMakeLists.txt
+===================================================================
+--- okular.orig/tests/CMakeLists.txt	2014-05-23 16:18:35.878350291 +0200
++++ okular/tests/CMakeLists.txt	2014-05-23 16:19:35.879972442 +0200
+@@ -3,8 +3,8 @@
+ kde4_add_unit_test( shelltest shelltest.cpp ../shell/shellutils.cpp )
+ target_link_libraries( shelltest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+ 
+-kde4_add_unit_test( parttest parttest.cpp )
+-target_link_libraries( parttest ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
++# kde4_add_unit_test( parttest parttest.cpp )
++# target_link_libraries( parttest ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
+ 
+ kde4_add_unit_test( documenttest documenttest.cpp )
+ target_link_libraries( documenttest ${KDE4_KDECORE_LIBS} ${KDE4_THREADWEAVER_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c54140a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no_xrandr_support_on_xvfb.patch

-- 
okular packaging