[SCM] khtml packaging branch, master, updated. debian/5.25.0-1-6-gf567833

Maximiliano Curia maxy at moszumanska.debian.org
Thu Sep 29 15:20:00 UTC 2016


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

The following commit has been merged in the master branch:
commit f5678331c761002640227ab38ab04984a5dc8a97
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 29 14:16:28 2016 +0200

    Replace dbus-launch by dbus-run-session in tests
---
 debian/changelog       | 1 +
 debian/tests/control   | 2 +-
 debian/tests/testsuite | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fc946b..67c9f40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ khtml (5.26.0-1) unstable; urgency=medium
 
   [ Maximiliano Curia ]
   * Bump group breaks (5.26)
+  * Replace dbus-launch with dbus-run-session in tests
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Sep 2016 12:03:57 +0200
 
diff --git a/debian/tests/control b/debian/tests/control
index 1e644dc..e668b3f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: testsuite
 Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus-x11, openbox
+         xvfb, xauth, dbus (>= 1.8), openbox
 Restrictions: rw-build-tree
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index 00220b9..67b3bd8 100644
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -7,4 +7,4 @@ debian/rules clean 2>&1
 dpkg-source --before-build .
 debian/rules build 2>&1
 xvfb-run -a --server-args="-screen 0 1024x768x24+32" \
-    dbus-launch --exit-with-session debian/tests/testsuite.xsession
+    dbus-run-session -- debian/tests/testsuite.xsession

-- 
khtml packaging



More information about the pkg-kde-commits mailing list