r54695 - in /desktop/unstable/gnome-settings-daemon/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Nov  2 17:44:59 2017
New Revision: 54695

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54695
Log:
Honour DEB_BUILD_OPTIONS=nocheck (Closes: #880486)

Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/rules

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=54695&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog	[utf-8] Thu Nov  2 17:44:59 2017
@@ -1,7 +1,11 @@
 gnome-settings-daemon (3.26.2-1) UNRELEASED; urgency=medium
 
+  [ Michael Biebl ]
   * New upstream release
   * Switch to dh_missing
+
+  [ Helmut Grohne ]
+  * Honour DEB_BUILD_OPTIONS=nocheck (Closes: #880486)
 
  -- Michael Biebl <biebl at debian.org>  Thu, 02 Nov 2017 18:24:15 +0100
 

Modified: desktop/unstable/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/rules?rev=54695&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/rules	[utf-8] Thu Nov  2 17:44:59 2017
@@ -32,6 +32,7 @@
 	dh_missing --fail-missing
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 # The tests are not fatal on non-linux architectures
 # See: https://bugzilla.gnome.org/show_bug.cgi?id=770684#c2
 ifeq (,$(filter $(DEB_HOST_ARCH), hurd-i386 kfreebsd-i386 kfreebsd-amd64))
@@ -39,3 +40,4 @@
 else
 	xvfb-run dh_auto_test || true
 endif
+endif