r53372 - in /desktop/unstable/clutter-1.0/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Sat Sep  2 21:13:03 2017
New Revision: 53372

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53372
Log:
Ignore test failures on Debian. See bug 874077.

Modified:
    desktop/unstable/clutter-1.0/debian/changelog
    desktop/unstable/clutter-1.0/debian/control
    desktop/unstable/clutter-1.0/debian/control.in
    desktop/unstable/clutter-1.0/debian/rules

Modified: desktop/unstable/clutter-1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/changelog?rev=53372&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/changelog	[utf-8] Sat Sep  2 21:13:03 2017
@@ -1,3 +1,15 @@
+clutter-1.0 (1.26.2+dfsg-3) UNRELEASED; urgency=medium
+
+  * Release to unstable
+  * debian/control.in:
+    - Drop Build-Depends on libgl1-mesa-dri
+  * debian/rules:
+    - Ignore test failures on Debian. See bug 874077.
+
+  * Allow tests to fail the build on Ubuntu. The tests fail in Debian.
+
+ -- Jeremy Bicha <jbicha at debian.org>  Fri, 01 Sep 2017 23:35:16 -0400
+
 clutter-1.0 (1.26.2+dfsg-2) experimental; urgency=medium
 
   * Convert from cdbs to dh

Modified: desktop/unstable/clutter-1.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/control?rev=53372&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/control	[utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/control	[utf-8] Sat Sep  2 21:13:03 2017
@@ -6,7 +6,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Jeremy Bicha <jbicha at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Rico Tzschichholz <ricotz at ubuntu.com>
 Build-Depends: debhelper (>= 10),
                autopoint,
                dbus <!nocheck>,
@@ -25,7 +25,6 @@
                libxcomposite-dev (>= 1:0.4),
                libxi-dev,
                gtk-doc-tools (>= 1.20),
-               libgl1-mesa-dri <!nocheck>,
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>,

Modified: desktop/unstable/clutter-1.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/control.in?rev=53372&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/control.in	[utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/control.in	[utf-8] Sat Sep  2 21:13:03 2017
@@ -21,7 +21,6 @@
                libxcomposite-dev (>= 1:0.4),
                libxi-dev,
                gtk-doc-tools (>= 1.20),
-               libgl1-mesa-dri <!nocheck>,
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>,

Modified: desktop/unstable/clutter-1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/clutter-1.0/debian/rules?rev=53372&op=diff
==============================================================================
--- desktop/unstable/clutter-1.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/clutter-1.0/debian/rules	[utf-8] Sat Sep  2 21:13:03 2017
@@ -44,11 +44,16 @@
 override_dh_makeshlibs:
 	dh_makeshlibs -V -- -c4
 
-# Don't fail the build for failing tests since the tests will likely
-# fail on some architectures. Do a follow-up to enable build-failing
-# on architectures that matter more.
+# See https://bugs.debian.org/874077
+# Ignore test failures on Debian and on s390x
 override_dh_auto_test:
+ifneq (,$(findstring $(DEB_HOST_ARCH),"s390x"))
 	-dbus-run-session -- xvfb-run -a dh_auto_test
+else ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
+	dbus-run-session -- xvfb-run -a dh_auto_test
+else
+	-dbus-run-session -- xvfb-run -a dh_auto_test
+endif
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libclutter-1.0-dbg (<< 1.26.2+dfsg-2~)'