[SCM] baloo packaging branch, master, updated. debian/5.25.0-1-4-g11964c6

Maximiliano Curia maxy at moszumanska.debian.org
Thu Sep 29 15:18:25 UTC 2016


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

The following commit has been merged in the master branch:
commit 11964c6fb9fb38ecba9560f2aeb7b6a085af6dcf
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 29 12:23:31 2016 +0200

    Avoid using dbus-launch to run the tests
    
    Closes: 835837
    Thanks: Simon McVittie for the report
---
 debian/changelog       | 4 ++++
 debian/tests/control   | 2 +-
 debian/tests/testsuite | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e60fd16..f7b804e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ baloo-kf5 (5.26.0-1) unstable; urgency=medium
   [ Automatic packaging ]
   * Update build-deps and deps with the info from cmake
 
+  [ Maximiliano Curia ]
+  * Avoid using dbus-launch to run the tests (Closes: #835837)
+    Thanks to Simon McVittie for the report
+
  -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Sep 2016 12:01:44 +0200
 
 baloo-kf5 (5.25.0-1) unstable; urgency=medium
diff --git a/debian/tests/control b/debian/tests/control
index 2453459..38069b7 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential, dbus-x11, xauth, xvfb
+Depends: @, @builddeps@, build-essential, dbus (>= 1.8), xauth, xvfb
 Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 4b3d84a..d8108c2 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 HOME=$(mktemp -d) xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    dbus-launch --exit-with-session dh_auto_test
+    dbus-run-session -- dh_auto_test

-- 
baloo packaging



More information about the pkg-kde-commits mailing list