r42208 - in /desktop/experimental/glib2.0/debian: changelog tests/control tests/installed-tests

[laney at users.alioth.debian.org]

Author: laney
Date: Wed Aug 20 15:01:29 2014
New Revision: 42208

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=42208
Log:
debian/tests/installed-tests: Revert the previous change - require dbus >=
1.8 and always use dbus-run-session.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/tests/control
    desktop/experimental/glib2.0/debian/tests/installed-tests

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=42208&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Wed Aug 20 15:01:29 2014
@@ -1,3 +1,10 @@
+glib2.0 (2.41.2-2) UNRELEASED; urgency=medium
+
+  * debian/tests/installed-tests: Revert the previous change - require dbus >=
+    1.8 and always use dbus-run-session.
+
+ -- Iain Lane <laney at debian.org>  Wed, 20 Aug 2014 15:58:39 +0100
+
 glib2.0 (2.41.2-1) experimental; urgency=medium
 
   * New upstream release

Modified: desktop/experimental/glib2.0/debian/tests/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/control?rev=42208&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/control	[utf-8] Wed Aug 20 15:01:29 2014
@@ -2,4 +2,4 @@
 Depends: libglib2.0-dev, build-essential
 
 Tests: installed-tests
-Depends: libglib2.0-tests, dbus-x11, dbus, xauth, xvfb, gnome-desktop-testing
+Depends: libglib2.0-tests, dbus-x11, dbus (>= 1.8), xauth, xvfb, gnome-desktop-testing

Modified: desktop/experimental/glib2.0/debian/tests/installed-tests
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/installed-tests?rev=42208&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] Wed Aug 20 15:01:29 2014
@@ -7,8 +7,4 @@
 
 export XDG_RUNTIME_DIR=$ADTTMP
 
-if [ -x /usr/bin/dbus-run-session ]; then
-    dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib
-else
-    dbus-launch --exit-with-session xvfb-run -a gnome-desktop-testing-runner glib
-fi
+dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib