[SCM] tablet kcm packaging files branch, master, updated. debian/2.0-1-4-gb671937

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kcm-tablet.git;a=commitdiff;h=017cbf1

The following commit has been merged in the master branch:
commit 017cbf11cd295e101765bcf9aef3a2703fbe9519
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Aug 20 19:01:40 2013 -0300

    Fix FTBFS due to test being enabled.
    
    Add build dependencies to allow tests to run.
    Start a virtual X session and dbus.
---
 debian/changelog |    4 ++++
 debian/control   |    2 +-
 debian/rules     |    3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ab4f66b..af6a71f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 wacomtablet (2.0-2) UNRELEASED; urgency=low
 
+  * Fix FTBFS due to KDE4_ENABLE_TESTS being ON since kdelibs 4.10:
+    - Add xvfb, xauth and dbus-x11 as build dependencies to allow tests to run.
+    - Override dh_auto_test to start the virtual X server and the dbus session.
+
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Tue, 20 Aug 2013 18:54:21 -0300
 
 wacomtablet (2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 83c31de..5869a21 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: kde
 Priority: extra
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.3.16), cmake, kdelibs5-dev, pkg-kde-tools (>= 0.6.2),
- libxi-dev, libxrandr-dev, xserver-xorg-input-wacom
+ libxi-dev, libxrandr-dev, xserver-xorg-input-wacom, xvfb, xauth, dbus-x11
 Standards-Version: 3.9.4
 Homepage: http://projects.kde.org/projects/extragear/base/wacomtablet
 Uploaders: Sune Vuorela <debian at pusling.com>, Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
diff --git a/debian/rules b/debian/rules
index 1ac64fa..590ae92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,3 +13,6 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
 override_dh_shlibdeps:
 	dh_shlibdeps -Xplasma_applet_wacomtabletsettings.so -- -dRecommends debian/kde-config-tablet/usr/lib/kde4/plasma_applet_wacomtabletsettings.so -dDepends
+
+override_dh_auto_test:
+	xvfb-run dbus-launch dh_auto_test

-- 
tablet kcm packaging files