[SCM] qtlocation packaging branch, master, updated. debian/5.3.0-1-9-g0b42fdc

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=e9d4976

The following commit has been merged in the master branch:
commit e9d4976af7658635ecce864999e2adebf3e63978
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 27 19:10:24 2014 -0300

    Add dbus as build dependency.
    
    Run dbus-launch for the tests.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f531a74..13a55ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ qtlocation-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
     not be deactivated but solved, except we have a good reason to do it.
   * Remove qtdeclarative5-qtquick2-plugin from the build dependencies, it is
     not really needed.
+  * Add dbus as build dependency and run dbus-launch for the tests.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2014 15:28:31 -0300
 
diff --git a/debian/control b/debian/control
index 2da49b3..589d684 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9.0.0),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.3.0+dfsg~),
                qtdeclarative5-private-dev (>= 5.3.0~),
-               xauth,
+               xauth, dbus,
                xvfb
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.3.0+dfsg~),
                      qttools5-dev-tools (>= 5.3.0~)
diff --git a/debian/rules b/debian/rules
index 79436b5..de191ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ override_dh_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	xvfb-run -a dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
+	xvfb-run -a dbus-launch dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
 endif
 
 override_dh_auto_clean:

-- 
qtlocation packaging