Bug#880486: gnome-settings-daemon FTCBFS: fails running tests under DEB_BUILD_OPTIONS=nocheck

[Helmut Grohne]

Source: gnome-settings-daemon
Version: 3.26.1-2
Tags: patch
User: helmutg at debian.org
Usertags: rebootstrap

gnome-settings-daemon fails to cross build from soruce, because it fails
running tests (xvfb-run more specifically) even when DEB_BUILD_OPTIONS
contains nocheck. After skipping tests for nocheck,
gnome-settings-daemon cross builds successfuly. Please consider applying
the attached patch.

Helmut
-------------- next part --------------
diff --minimal -Nru gnome-settings-daemon-3.26.1/debian/changelog gnome-settings-daemon-3.26.1/debian/changelog
--- gnome-settings-daemon-3.26.1/debian/changelog	2017-10-13 23:06:30.000000000 +0200
+++ gnome-settings-daemon-3.26.1/debian/changelog	2017-10-30 22:12:00.000000000 +0100
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.26.1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Honour DEB_BUILD_OPTIONS=nocheck. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Mon, 30 Oct 2017 22:12:00 +0100
+
 gnome-settings-daemon (3.26.1-2) unstable; urgency=medium
 
   * Release to unstable
diff --minimal -Nru gnome-settings-daemon-3.26.1/debian/rules gnome-settings-daemon-3.26.1/debian/rules
--- gnome-settings-daemon-3.26.1/debian/rules	2017-08-07 16:32:05.000000000 +0200
+++ gnome-settings-daemon-3.26.1/debian/rules	2017-10-30 22:11:58.000000000 +0100
@@ -28,6 +28,7 @@
 	find debian/tmp -type f -name '*.la' -delete -print
 	dh_install --fail-missing
 
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 override_dh_auto_test:
 # The tests are not fatal on non-linux architectures
 # See: https://bugzilla.gnome.org/show_bug.cgi?id=770684#c2
@@ -36,3 +37,4 @@
 else
 	xvfb-run dh_auto_test || true
 endif
+endif