[SCM] okular packaging branch, master, updated. debian/16.08.2-1-75-g412778f

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:17:00 UTC 2017


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

The following commit has been merged in the master branch:
commit c367a5a31d28eff93936ec14e93cdb1aba60e5e4
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jul 17 10:53:49 2017 +0100

    remove obsolete patch
---
 debian/patches/series                           |  1 -
 debian/patches/temporarily_disable_failing_test | 21 ---------------------
 2 files changed, 22 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d282a50..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-temporarily_disable_failing_test
diff --git a/debian/patches/temporarily_disable_failing_test b/debian/patches/temporarily_disable_failing_test
deleted file mode 100644
index 701571c..0000000
--- a/debian/patches/temporarily_disable_failing_test
+++ /dev/null
@@ -1,21 +0,0 @@
-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
-
-===================================================================
----
- 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 )
- 
--kde4_add_unit_test( mainshelltest mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp )
--target_link_libraries( mainshelltest ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY} okularpart okularcore )
-+# kde4_add_unit_test( mainshelltest mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp )
-+# target_link_libraries( mainshelltest ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY} okularpart okularcore )

-- 
okular packaging



More information about the pkg-kde-commits mailing list