diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-10-03 14:29:13 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-10-03 16:14:55 +0100 |
| commit | 179deebe2a250c2fe9a4efd4ac8e5f2d93298328 (patch) | |
| tree | 753df93f85ffc1d0ab71d4174f0e02b658bab425 | |
| parent | c8e8f3b8ecb65b2cb25a1b8c1748ca99cada491b (diff) | |
| download | dbus-glib-179deebe2a250c2fe9a4efd4ac8e5f2d93298328.tar.gz | |
ci: Avoid dpkg warnings by installing gnome-common before autoconf-archive
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rwxr-xr-x | tools/ci-install.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index f5b7e40..453488d 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -112,10 +112,11 @@ case "$ci_distro" in case "$ci_suite" in (trusty|jessie) # Ubuntu 14.04's autoconf-archive is too old, and older - # gnome-common has files in common with it + # gnome-common has files in common with it. These are + # from Debian 9 'stretch'. wget http://deb.debian.org/debian/pool/main/a/autoconf-archive/autoconf-archive_20160916-1_all.deb wget http://deb.debian.org/debian/pool/main/g/gnome-common/gnome-common_3.18.0-3_all.deb - $sudo dpkg -i --auto-deconfigure autoconf-archive_*_all.deb gnome-common_*_all.deb + $sudo dpkg -i --auto-deconfigure gnome-common_*_all.deb autoconf-archive_*_all.deb rm autoconf-archive_*_all.deb gnome-common_*_all.deb ;; esac |