[SCM] knotifications packaging branch, master, updated. debian/5.25.0-1-6-gd5435e5

Maximiliano Curia maxy at moszumanska.debian.org
Thu Sep 29 20:21:11 UTC 2016


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

The following commit has been merged in the master branch:
commit d5435e558626bc38cc05e2c821af958439ba15c1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 29 21:59:51 2016 +0200

    Disable dh_auto_test at build time
    
    The auto tests were not being called, and they are failling. Disable for
    now.
---
 debian/changelog       | 6 ++++++
 debian/control         | 1 -
 debian/rules           | 3 ++-
 debian/tests/control   | 2 +-
 debian/tests/testsuite | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a91d7f..e4ff435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+knotifications (5.26.0-2) unstable; urgency=medium
+
+  * Fix dh_auto_test invocation.
+
+ -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Sep 2016 21:58:21 +0200
+
 knotifications (5.26.0-1) unstable; urgency=medium
 
   [ Automatic packaging ]
diff --git a/debian/control b/debian/control
index 90c8cff..a9db480 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12~),
-               dbus (>= 1.8),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.26.0~),
                libdbusmenu-qt5-dev,
diff --git a/debian/rules b/debian/rules
index 57cff1a..2dbcb0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,4 +9,5 @@ override_dh_strip:
 	$(overridden_command) --dbgsym-migration='libkf5notifications5-dbg (<= 5.19.0-1~~)'
 
 override_dh_auto_test:
-	dbus-run-session -- $(overriden_command)
+	# Disable auto tests at build time
+	:
diff --git a/debian/tests/control b/debian/tests/control
index 08f7d46..e6fbc64 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
 # Tests: testsuite
-# Depends: @, @builddeps@, build-essential, dbus (>= 1.8)
+# Depends: @, @builddeps@, build-essential, dbus (>= 1.8), xvfb, xauth
 # Restrictions: build-needed
 
 Tests: acc
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index dabe645..64d0647 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-dh_auto_test
+xvfb-run -a dbus-run-session -- dh_auto_test

-- 
knotifications packaging



More information about the pkg-kde-commits mailing list