[SCM] okular packaging branch, master, updated. debian/4.13.3-1-5-g89d1604

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 45a7308d3e23dcf8d3faa9fc06c6f0f995f469df
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Aug 24 06:29:51 2014 +0200

    Remove 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, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ab2857..9ec2e2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ okular (4:4.14.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Rename libokularcore package to libokularcore5.
+  * Remove patch: no_xrandr_support_on_xvfb.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 18 Aug 2014 18:17:57 +0200
 
diff --git a/debian/patches/no_xrandr_support_on_xvfb.patch b/debian/patches/no_xrandr_support_on_xvfb.patch
deleted file mode 100644
index 1d0d518..0000000
--- a/debian/patches/no_xrandr_support_on_xvfb.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
index c54140a..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-no_xrandr_support_on_xvfb.patch

-- 
okular packaging