From 23ee16077a7e419ec6fc2c995d6e8f273a8238ca Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@users.noreply.github.com>
Date: Sat, 24 Sep 2016 12:24:47 -0700
Subject: [PATCH] travis: build ubuntu packages for xenial, not wily (#2474)

The extra rm command when configuring the repository is necessary
because of https://bugs.debian.org/838779.
---
 travis/bintray-autobuild-ubuntu.json     | 4 ++--
 travis/travis-base-ubuntu-386.Dockerfile | 5 +++--
 travis/travis-base-ubuntu.Dockerfile     | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/travis/bintray-autobuild-ubuntu.json b/travis/bintray-autobuild-ubuntu.json
index 2ceef7d4..79bd50c5 100644
--- a/travis/bintray-autobuild-ubuntu.json
+++ b/travis/bintray-autobuild-ubuntu.json
@@ -15,7 +15,7 @@
         {
             "includePattern": "deb/ubuntu-amd64/(.*\\.deb)$",
 	    "matrixParams": {
-                "deb_distribution": "wily",
+                "deb_distribution": "xenial",
                 "deb_component": "main",
                 "deb_architecture": "amd64"
 	    },
@@ -24,7 +24,7 @@
         {
             "includePattern": "deb/ubuntu-i386/(.*\\.deb)$",
 	    "matrixParams": {
-                "deb_distribution": "wily",
+                "deb_distribution": "xenial",
                 "deb_component": "main",
                 "deb_architecture": "i386"
 	    },
diff --git a/travis/travis-base-ubuntu-386.Dockerfile b/travis/travis-base-ubuntu-386.Dockerfile
index c20cc41d..65f123c8 100644
--- a/travis/travis-base-ubuntu-386.Dockerfile
+++ b/travis/travis-base-ubuntu-386.Dockerfile
@@ -1,7 +1,7 @@
 # vim:ft=Dockerfile
 # Same as travis-base.Dockerfile, but without the test suite dependencies since
 # we only build Debian packages on Ubuntu i386, we don’t run the tests.
-FROM i386/ubuntu:wily
+FROM i386/ubuntu:xenial
 
 RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
 # Paper over occasional network flakiness of some mirrors.
@@ -24,9 +24,10 @@ RUN linux32 apt-get update && \
 
 # Install i3 build dependencies.
 COPY debian/control /usr/src/i3-debian-packaging/control
-RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu wily main' > /etc/apt/sources.list.d/i3-autobuild.list && \
+RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \
     linux32 apt-get update && \
     linux32 apt-get --allow-unauthenticated install i3-autobuild-keyring && \
+    rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
     linux32 apt-get update && \
     DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
     rm -rf /var/lib/apt/lists/*
diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile
index e060fe0f..ab474691 100644
--- a/travis/travis-base-ubuntu.Dockerfile
+++ b/travis/travis-base-ubuntu.Dockerfile
@@ -1,7 +1,7 @@
 # vim:ft=Dockerfile
 # Same as travis-base.Dockerfile, but without the test suite dependencies since
 # we only build Debian packages on Ubuntu, we don’t run the tests.
-FROM ubuntu:wily
+FROM ubuntu:xenial
 
 RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
 # Paper over occasional network flakiness of some mirrors.
@@ -25,9 +25,10 @@ RUN apt-get update && \
 
 # Install i3 build dependencies.
 COPY debian/control /usr/src/i3-debian-packaging/control
-RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu wily main' > /etc/apt/sources.list.d/i3-autobuild.list && \
+RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \
     apt-get update && \
     apt-get --allow-unauthenticated install i3-autobuild-keyring && \
+    rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
     rm -rf /var/lib/apt/lists/*