From: Raspbian forward pporter <root@raspbian.org>
Date: Fri, 28 Dec 2018 05:47:50 +0000 (+0000)
Subject: Merge version 1.26.2+dfsg-7+rpi1 and 1.26.2+dfsg-10 to produce 1.26.2+dfsg-10+rpi1
X-Git-Tag: archive/raspbian/1.26.2+dfsg-10+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cbbb5424e6b5712be6aa16a8c4de70f25c5cb728;p=clutter-1.0.git

Merge version 1.26.2+dfsg-7+rpi1 and 1.26.2+dfsg-10 to produce 1.26.2+dfsg-10+rpi1
---

0dc523c1b1094688ef39ea3bb8e71886f454fba9
diff --cc debian/changelog
index c4130c4,7c6cc38..ca67dd2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,21 +1,28 @@@
- clutter-1.0 (1.26.2+dfsg-7+rpi1) buster-staging; urgency=medium
++clutter-1.0 (1.26.2+dfsg-10+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 1.26.2+dfsg-7+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 11 Oct 2018 23:45:19 +0000]
 +  * Disable testsuite on armhf too (hang encountered on a raspbian autobuilder).
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 11 Oct 2018 23:45:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 28 Dec 2018 05:47:50 +0000
++
+ clutter-1.0 (1.26.2+dfsg-10) unstable; urgency=medium
+ 
+   * fix typo in dh_auto_test override
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Tue, 25 Dec 2018 19:30:54 -0500
+ 
+ clutter-1.0 (1.26.2+dfsg-9) unstable; urgency=medium
+ 
+   * Restore dh_auto_test override
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Tue, 25 Dec 2018 11:25:26 -0500
+ 
+ clutter-1.0 (1.26.2+dfsg-8) unstable; urgency=medium
+ 
+   * Restore -Wl,-O1 to our LDFLAGS
+   * Bump Standards-Version to 4.3.0
+ 
+  -- Jeremy Bicha <jbicha@debian.org>  Sun, 23 Dec 2018 18:32:52 -0500
  
  clutter-1.0 (1.26.2+dfsg-7) unstable; urgency=medium
  
diff --cc debian/rules
index a3a47f9,c81a601..244055d
--- a/debian/rules
+++ b/debian/rules
@@@ -47,9 -47,9 +47,9 @@@ override_dh_auto_test
  # Don't run the tests on s390x since it hangs the build on Launchpad
  # Don't run on armel since it hung with
  # https://buildd.debian.org/status/logs.php?pkg=clutter-1.0&ver=1.26.2%2Bdfsg-5
 -ifneq (,$(filter armel s390x,$(DEB_HOST_ARCH)))
 +ifneq (,$(filter armhf armel s390x,$(DEB_HOST_ARCH)))
  # Ignore test failures on architectures where they fail
- else ifneq (,$(filter hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64 mips powerpc ppc64 sh4 sparc64,$(DEB_HOST_ARCH)))
+ else ifneq (,$(filter hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc ppc64 sparc64,$(DEB_HOST_ARCH)))
  	-dbus-run-session -- xvfb-run -a dh_auto_test
  else
  	dbus-run-session -- xvfb-run -a dh_auto_test