r35492 - in /desktop/experimental/glib2.0/debian: changelog rules

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Jun 28 05:18:52 2012
New Revision: 35492

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35492
Log:
debian/rules: Make tests always fatal on Ubuntu.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35492&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Jun 28 05:18:52 2012
@@ -1,3 +1,9 @@
+glib2.0 (2.33.3-3) UNRELEASED; urgency=low
+
+  * debian/rules: Make tests always fatal on Ubuntu.
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 28 Jun 2012 07:18:26 +0200
+
 glib2.0 (2.33.3-2) experimental; urgency=low
 
   * Rename 07_socket_test_timespan_jitter.patch to 00git_* and update

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=35492&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Thu Jun 28 05:18:52 2012
@@ -54,9 +54,10 @@
 # where creating /home/buildd/.dbus-keyrings fails
 export G_HOME=$(CURDIR)/debian/build
 
-# make tests non-fatal on architectures which currently have failed tests
+# make tests non-fatal on Debian architectures which currently have failed
+# tests; always fail on Ubuntu
 ifneq ($(findstring $(DEB_BUILD_ARCH), armel armhf kfreebsd-i386 kfreebsd-amd64 s390x sparc),)
-DEB_MAKE_CHECK_TARGET = -k check || true
+DEB_MAKE_CHECK_TARGET = -k check || ! dpkg-vendor --is ubuntu
 else
 DEB_MAKE_CHECK_TARGET = -k check
 endif