[SCM] kget packaging branch, master, updated. debian/4%16.08.0-3-5-ge63df56

Pino Toscano pino at moszumanska.debian.org
Thu Sep 7 06:37:49 UTC 2017


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

The following commit has been merged in the master branch:
commit 99d1ffd2d98181c2ed122845d22fccf9fac2565f
Author: Pino Toscano <pino at debian.org>
Date:   Thu Sep 7 08:36:25 2017 +0200

    drop useless patches
---
 debian/changelog                           |  7 +++++++
 debian/patches/disable_kget-verifiertest   | 22 ----------------------
 debian/patches/disable_kget_test_transfers | 18 ------------------
 debian/patches/kget_testjob_finished_stays | 13 -------------
 debian/patches/series                      |  3 ---
 5 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f12ce39..a5e4b7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,13 @@ kget (4:16.08.0-4) UNRELEASED; urgency=medium
   * Drop the libgpgme11-dev build dependency, since it is not used.
   * Pass -DKDE4_BUILD_TESTS=OFF to cmake to disable the build of unit tests,
     since they are not run anyway.
+  * Update the patches:
+    - disable_kget_test_transfers: drop, only for not run unit tests (and with
+      unclear status and reasons)
+    - disable_kget-verifiertest: drop, only for not run unit tests (and with
+      unclear status and reasons)
+    - kget_testjob_finished_stays: drop, only for not run unit tests (and with
+      unclear status and reasons)
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 07 Sep 2017 07:48:05 +0200
 
diff --git a/debian/patches/disable_kget-verifiertest b/debian/patches/disable_kget-verifiertest
deleted file mode 100644
index 918bf8e..0000000
--- a/debian/patches/disable_kget-verifiertest
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: kget/tests/CMakeLists.txt
-===================================================================
---- kget.orig/tests/CMakeLists.txt	2014-02-04 16:59:06.458100247 +0100
-+++ kget/tests/CMakeLists.txt	2014-02-04 16:59:50.835120937 +0100
-@@ -24,12 +24,12 @@
- 
-     #===========Verifier===========
-     if (QCA2_FOUND)
--        kde4_add_unit_test(verifiertest
--        TESTNAME kget-verifiertest
--        verifiertest.cpp
--        )
-+        # kde4_add_unit_test(verifiertest
-+        # TESTNAME kget-verifiertest
-+        # verifiertest.cpp
-+        # )
- 
--        target_link_libraries(verifiertest ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} ${QCA2_LIBRARIES} kgetcore)
-+        # target_link_libraries(verifiertest ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} ${QCA2_LIBRARIES} kgetcore)
-     endif (QCA2_FOUND)
- 
- 
diff --git a/debian/patches/disable_kget_test_transfers b/debian/patches/disable_kget_test_transfers
deleted file mode 100644
index c37f529..0000000
--- a/debian/patches/disable_kget_test_transfers
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: kget/tests/CMakeLists.txt
-===================================================================
---- kget.orig/tests/CMakeLists.txt	2014-02-03 16:52:53.631055962 +0100
-+++ kget/tests/CMakeLists.txt	2014-02-04 16:58:28.093217910 +0100
-@@ -16,10 +16,10 @@
-     qt4_add_dbus_interface(kget_test_transfers_SRCS ../dbus/org.kde.kget.transfer.xml transfer_interface)
-     qt4_add_dbus_interface(kget_test_transfers_SRCS ../dbus/org.kde.kget.verifier.xml verifier_interface)
- 
--    kde4_add_unit_test(kget_test_transfers
--        ${kget_test_transfers_SRCS})
-+    # kde4_add_unit_test(kget_test_transfers
-+    #     ${kget_test_transfers_SRCS})
- 
--    target_link_libraries(kget_test_transfers ${QT_QTTEST_LIBRARY} ${KDE4_KIO_LIBS} kgetcore)
-+    # target_link_libraries(kget_test_transfers ${QT_QTTEST_LIBRARY} ${KDE4_KIO_LIBS} kgetcore)
- 
- 
-     #===========Verifier===========
diff --git a/debian/patches/kget_testjob_finished_stays b/debian/patches/kget_testjob_finished_stays
deleted file mode 100644
index 3ee66bd..0000000
--- a/debian/patches/kget_testjob_finished_stays
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kget/tests/schedulertest.cpp
-===================================================================
---- kget.orig/tests/schedulertest.cpp	2014-02-09 19:35:34.939060914 +0100
-+++ kget/tests/schedulertest.cpp	2014-02-09 20:05:15.136885096 +0100
-@@ -57,7 +57,7 @@
- 
- void TestJob::stop()
- {
--    if ((status() == Running) || (status() == Aborted) || (status() == Moving) || (status() == Finished)) {
-+    if ((status() == Running) || (status() == Aborted) || (status() == Moving)) {
-         setStatus(Stopped);
-     }
- }
diff --git a/debian/patches/series b/debian/patches/series
index a56d3d7..b943484 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
-disable_kget_test_transfers
-disable_kget-verifiertest
-kget_testjob_finished_stays
 minified_file
 disable-plasma.diff

-- 
kget packaging



More information about the pkg-kde-commits mailing list