Merge branch 'master' into kubuntu_unstable
Conflicts:
debian/control
debian/patches/series
Harald Sitter
8 years ago
|
0 |
kwindowsystem (5.11.0-1) unstable; urgency=medium
|
|
1 |
|
|
2 |
* New upstream release (5.10.0).
|
|
3 |
* Update symbols files from buildds logs (5.9.0-1).
|
|
4 |
* Update symbols files.
|
|
5 |
* New upstream release (5.11.0).
|
|
6 |
|
|
7 |
-- Maximiliano Curia <maxy@debian.org> Fri, 26 Jun 2015 13:45:08 +0200
|
|
8 |
|
0 | 9 |
kwindowsystem (5.10.0-0ubuntu3) wily; urgency=medium
|
1 | 10 |
|
2 | 11 |
* Add kubuntu_skip-failed-tests.diff to get it into the archive
|
4 | 4 |
Uploaders: Maximiliano Curia <maxy@debian.org>
|
5 | 5 |
Build-Depends: cmake (>= 2.8.12),
|
6 | 6 |
debhelper (>= 9),
|
7 | |
extra-cmake-modules (>= 5.10.0),
|
|
7 |
extra-cmake-modules (>= 5.11.0~),
|
8 | 8 |
libqt5x11extras5-dev (>= 5.4),
|
9 | 9 |
libx11-dev,
|
10 | 10 |
libxcb-keysyms1-dev,
|
debian/patches/kubuntu_skip-failed-tests.diff
less
more
0 | |
Description: skip failed tests
|
1 | |
dunno why these are failed, I need to talk to upstream to work it out
|
2 | |
Author: Jonathan Riddell
|
3 | |
Forwarded: todo
|
4 | |
Last-Update: 2015-06-22
|
5 | |
---
|
6 | |
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
7 | |
Index: kwindowsystem-5.10.0/autotests/CMakeLists.txt
|
8 | |
===================================================================
|
9 | |
--- kwindowsystem-5.10.0.orig/autotests/CMakeLists.txt
|
10 | |
+++ kwindowsystem-5.10.0/autotests/CMakeLists.txt
|
11 | |
@@ -33,19 +33,13 @@ endmacro()
|
12 | |
|
13 | |
if(X11_FOUND)
|
14 | |
kwindowsystem_unit_tests(
|
15 | |
- kmanagerselectiontest
|
16 | |
kstartupinfo_unittest
|
17 | |
kxmessages_unittest
|
18 | |
)
|
19 | |
|
20 | |
kwindowsystem_unit_tests(
|
21 | |
kwindoweffectstest
|
22 | |
- kwindowinfox11test
|
23 | |
- kwindowsystemx11test
|
24 | |
kwindowsystem_threadtest
|
25 | |
- netrootinfotestwm
|
26 | |
- netwininfotestclient
|
27 | |
- netwininfotestwm
|
28 | |
)
|
29 | |
|
30 | |
kwindowsystem_executable_tests(
|
0 | |
kubuntu_skip-failed-tests.diff
|