[SCM] akonadi-search packaging branch, master, updated. debian/16.04.3-1-31-gea413d9

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 21 17:19:39 UTC 2016


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

The following commit has been merged in the master branch:
commit ea413d9116324ae223f008775a34ea37ad7925a7
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Oct 21 19:19:24 2016 +0200

    Replace dbus-launch with dbus-run-session in tests
    
    Closes: 835830
    Thanks: Simon McVittie for reporting
---
 debian/tests/control   | 2 +-
 debian/tests/testsuite | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/tests/control b/debian/tests/control
index f4a666d..a7140c1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         dbus-x11, xvfb, xauth, akonadi-backend-sqlite, xserver-xephyr
+         dbus (>= 1.8), xvfb, xauth, akonadi-backend-sqlite
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 6bf8085..85f2778 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,9 +1,4 @@
 #!/bin/sh
 
 xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-
-DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
-ret=$?
-kill ${x_pid}
-exit $ret
+    dbus-run-session -- dh_auto_test

-- 
akonadi-search packaging



More information about the pkg-kde-commits mailing list