From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 22 Nov 2016 21:39:40 +0000 (+0000)
Subject: Merge branch 'dbus-1.10'
X-Git-Tag: dbus-1.11.8~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8de8bbbeaf03c78f9fa69d1d49ef01a1749220a7;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.10'
---

8de8bbbeaf03c78f9fa69d1d49ef01a1749220a7
diff --cc .travis.yml
index 8b55d08a6,03f9c9a6b..f5e691a24
--- a/.travis.yml
+++ b/.travis.yml
@@@ -31,15 -34,6 +34,12 @@@ install
      xmlto
      xsltproc
      xvfb
-   - >
-     test "$dbus_ci_host" != mingw || sudo apt-get -qq -y install
-     binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386
 +  # Ubuntu 14.04's autoconf-archive is too old
 +  - >
 +    wget
 +    http://snapshot.debian.org/archive/debian/20160905T163745Z/pool/main/a/autoconf-archive/autoconf-archive_20160320-1_all.deb
 +  - 'sudo dpkg -i autoconf-archive_*_all.deb'
 +  - 'rm autoconf-archive_*_all.deb'
  script:
    # python-dbus and python-gi aren't available to Travis's version of
    # Python in /opt, which it uses as a default