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

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Mar 21 15:24:11 2013
New Revision: 37111

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37111
Log:
* debian/rules:
  + Use filter instead of findstring to match the current arch
    against the list of architectures where the test suite should
    not be fatal, as the latter matches substrings and so it was
    making the testsuite non-fatal on amd64 and i386 because they
    match kfreebsd-amd64 and kfreebsd-i386.

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=37111&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Mar 21 15:24:11 2013
@@ -17,6 +17,12 @@
       Debian. This fixes a testcase that was failing on every arch
       and was causing the build to fail on ia64 and powerpc as test
       failures are fatal on those arches.
+  * debian/rules:
+    + Use filter instead of findstring to match the current arch
+      against the list of architectures where the test suite should
+      not be fatal, as the latter matches substrings and so it was
+      making the testsuite non-fatal on amd64 and i386 because they
+      match kfreebsd-amd64 and kfreebsd-i386.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 20 Mar 2013 20:05:37 +0100
 

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=37111&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Thu Mar 21 15:24:11 2013
@@ -56,7 +56,7 @@
 
 # make tests non-fatal on Debian architectures which currently have failed
 # tests; always fail on Ubuntu; only run the tests for the main flavour
-ifneq ($(findstring $(DEB_BUILD_ARCH), armel armhf kfreebsd-i386 kfreebsd-amd64 s390x sparc mips hurd-i386),)
+ifneq ($(filter $(DEB_BUILD_ARCH), armel armhf kfreebsd-i386 kfreebsd-amd64 s390x sparc mips hurd-i386),)
 DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check || ! dpkg-vendor --is ubuntu)
 else
 DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check)