[SCM] kross packaging branch, master, updated. debian/5.12.0-1-5-gae844d5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 438cd7c46984dfb3559665a47dbc1df672d6bb07
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Sep 1 21:14:35 2015 +0200

    New upstream patch: upstream_disable_again_the_unittests
---
 debian/changelog                                   |  1 +
 debian/patches/series                              |  1 +
 .../patches/upstream_disable_again_the_unittests   | 42 ++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 902fc2f..dce73f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kross (5.13.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.13.0).
+  * New upstream patch: upstream_disable_again_the_unittests
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Sep 2015 20:34:21 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..53ed429
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_disable_again_the_unittests
diff --git a/debian/patches/upstream_disable_again_the_unittests b/debian/patches/upstream_disable_again_the_unittests
new file mode 100644
index 0000000..a3cd99f
--- /dev/null
+++ b/debian/patches/upstream_disable_again_the_unittests
@@ -0,0 +1,42 @@
+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