r54821 - in /desktop/unstable/libsecret/debian: changelog control control.in rules

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Sat Nov 11 20:41:54 2017
New Revision: 54821

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54821
Log:
Don't run Python & Vala tests on Ubuntu's s390x since they hang on LP's builders

Modified:
    desktop/unstable/libsecret/debian/changelog
    desktop/unstable/libsecret/debian/control
    desktop/unstable/libsecret/debian/control.in
    desktop/unstable/libsecret/debian/rules

Modified: desktop/unstable/libsecret/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/changelog?rev=54821&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/changelog	[utf-8] Sat Nov 11 20:41:54 2017
@@ -1,3 +1,11 @@
+libsecret (0.18.5-5) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - Don't run Python and Vala tests on Ubuntu's s390x since
+      they hang on Launchpad's builders
+
+ -- Jeremy Bicha <jbicha at debian.org>  Sat, 11 Nov 2017 15:28:13 -0500
+
 libsecret (0.18.5-4) unstable; urgency=medium
 
   * debian/control.in:

Modified: desktop/unstable/libsecret/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/control?rev=54821&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/control	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/control	[utf-8] Sat Nov 11 20:41:54 2017
@@ -18,8 +18,8 @@
                python3-dbus,
                python3-gi,
                gnome-pkg-tools,
-               dbus,
-               gjs
+               dbus <!nocheck>,
+               gjs <!nocheck>
 Standards-Version: 4.1.1
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libsecret
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libsecret/

Modified: desktop/unstable/libsecret/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/control.in?rev=54821&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/control.in	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/control.in	[utf-8] Sat Nov 11 20:41:54 2017
@@ -14,8 +14,8 @@
                python3-dbus,
                python3-gi,
                gnome-pkg-tools,
-               dbus,
-               gjs
+               dbus <!nocheck>,
+               gjs <!nocheck>
 Standards-Version: 4.1.1
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libsecret
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libsecret/

Modified: desktop/unstable/libsecret/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsecret/debian/rules?rev=54821&op=diff
==============================================================================
--- desktop/unstable/libsecret/debian/rules	[utf-8] (original)
+++ desktop/unstable/libsecret/debian/rules	[utf-8] Sat Nov 11 20:41:54 2017
@@ -7,10 +7,21 @@
 %:
 	dh $@ --with gir,gnome
 
+# Some tests hang on Launchpad builders on s390x
+override_dh_autoreconf:
+ifeq (yes,$(shell dpkg-vendor --is Ubuntu && echo yes))
+ifneq (,$(filter $(DEB_HOST_ARCH),s390x))
+	sed -i -e '/^TESTS/s/\$$(PY_TESTS)//' -e '/^TESTS/s/\$$(VALA_TESTS)//' \
+		 libsecret/Makefile.am
+endif
+endif
+	dh_autoreconf
+
 override_dh_install:
 	find debian/tmp/usr/lib -name '*.la' -delete
 	dh_install --fail-missing
 
 override_dh_auto_test:
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	env -u LD_PRELOAD dbus-run-session -- make check
-
+endif