r52684 - in /desktop/experimental/gnome-settings-daemon/debian: changelog rules

[jbicha-guest at users.alioth.debian.org]

Author: jbicha-guest
Date: Sun Jul 23 13:07:43 2017
New Revision: 52684

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52684
Log:
Make tests non-fatal on s390x too

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

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=52684&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog	[utf-8] Sun Jul 23 13:07:43 2017
@@ -4,7 +4,8 @@
     - Do not add the "US" keyboard layout by default for new users. For some
       reason, this keyboard was preferred over the system configured one on
       the first login. (Closes: #859268)
-  * debian/rules: Make the tests non fatal on non-linux architectures
+  * debian/rules: Make the tests non fatal on s390x and non-linux
+    architectures
 
  -- Laurent Bigonville <bigon at debian.org>  Sat, 15 Jul 2017 11:15:47 +0200
 

Modified: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=52684&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/rules	[utf-8] Sun Jul 23 13:07:43 2017
@@ -29,7 +29,7 @@
 	dh_install --fail-missing
 
 override_dh_auto_test:
-ifeq ($(DEB_HOST_ARCH_OS),linux)
+ifeq (,$(filter $(DEB_HOST_ARCH), s390x hurd-i386 kfreebsd-i386 kfreebsd-amd64))
 	xvfb-run dh_auto_test
 else
 	xvfb-run dh_auto_test || true