[SCM] kross packaging branch, master, updated. debian/5.13.0-1-4-g9f9b7ea

Maximiliano Curia maxy at moszumanska.debian.org
Mon Sep 14 22:09:15 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kross.git;a=commitdiff;h=a42824d

The following commit has been merged in the master branch:
commit a42824d05168b872e8825fda6f87ced869a62653
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Sep 14 22:33:17 2015 +0200

    Remove upstream patch: upstream_disable_again_the_unittests
---
 debian/patches/series                              |  1 -
 .../patches/upstream_disable_again_the_unittests   | 42 ----------------------
 2 files changed, 43 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 53ed429..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_disable_again_the_unittests
diff --git a/debian/patches/upstream_disable_again_the_unittests b/debian/patches/upstream_disable_again_the_unittests
deleted file mode 100644
index a3cd99f..0000000
--- a/debian/patches/upstream_disable_again_the_unittests
+++ /dev/null
@@ -1,42 +0,0 @@
-commit 373fa281ee9d4bf7e1c7c4ce58e5b5f8d9572725
-Author: David Faure <faure at kde.org>
-Date:   Sat Aug 15 10:08:30 2015 +0200
-
-    disable again the unittests that need the kross python interpreter
-    
-    (which is in kde/kdebindings/kross-interpreters)
-
-diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
-index a7b8e85..b77fe39 100644
---- a/autotests/CMakeLists.txt
-+++ b/autotests/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include(ECMMarkAsTest)
- 
-+## These unit tests must move to kross-interpreters.git, they require the python kross interpreter!
-+if (FALSE)
- set(krossqtstest_SRCS main.cpp)
- add_executable(krossqtstest qts.cpp)
- ecm_mark_as_test(krossqtstest)
-@@ -11,6 +13,7 @@ target_link_libraries(krossqtstest
- )
- 
- add_test(NAME krossqtstest-test-es COMMAND krossqtstest ${CMAKE_CURRENT_SOURCE_DIR}/qtstest.es)
-+endif()
- 
- add_executable(metafunctiontest metafunctiontest.cpp)
- ecm_mark_as_test(metafunctiontest)
-@@ -20,6 +23,8 @@ target_link_libraries(metafunctiontest
-    )
- add_test(NAME kross-metafunctiontest COMMAND metafunctiontest)
- 
-+## These unit tests must move to kross-interpreters.git, they require the python kross interpreter!
-+if (FALSE)
- set(krosstest_SRCS
-     testobject.cpp
-     main.cpp
-@@ -43,3 +48,4 @@ add_test(NAME kross-unittest-py COMMAND krosstest ${CMAKE_CURRENT_SOURCE_DIR}/un
- 
- # UI files have no interpreter
- # add_test(NAME kross-guiform-ui COMMAND krosstest ${CMAKE_CURRENT_SOURCE_DIR}/testguiform.ui)
-+endif()

-- 
kross packaging



More information about the pkg-kde-commits mailing list