[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.7-1-14-g6239f83

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=6239f83

The following commit has been merged in the master branch:
commit 6239f837e502116b51aad4e02f91ed0a15fdea1c
Author: Pino Toscano <pino at debian.org>
Date:   Sun Mar 27 10:20:32 2016 +0200

    fix running the test suite under X11
    
    - add the xvfb and xauth build dependencies
    - run dh_auto_test with xvfb-run
---
 debian/changelog | 3 +++
 debian/control   | 2 ++
 debian/rules     | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e9bd30a..1396c06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,9 @@ subtitlecomposer (0.6.2-0r1) UNRELEASED; urgency=medium
       fixed upstream
     - 0004-Fix-crash-Sonnet-Dialog-cannot-handle-empty-buffers.patch: drop,
       obsolete
+  * The test suite needs X11, so:
+    - add the xvfb and xauth build dependencies
+    - run dh_auto_test with xvfb-run
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 27 Mar 2016 08:57:39 +0200
 
diff --git a/debian/control b/debian/control
index cb370d2..8bf0b31 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools (>= 0.15.16),
  libicu-dev,
  libmpv-dev,
  libxcb1-dev,
+# for tests:
+ xvfb, xauth,
 Build-Conflicts: qt5-default
 Standards-Version: 3.9.6
 Homepage: https://github.com/maxrd2/subtitlecomposer
diff --git a/debian/rules b/debian/rules
index a54998d..d2ffb9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,6 @@
 
 %:
 	dh $@ --parallel --with=kf5,xine
+
+override_dh_auto_test:
+	xvfb-run -a dh_auto_test

-- 
subtitlecomposer packaging