From 563759f064dd160cbe704ec280a43fed3a23f559 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Thu, 13 Jun 2019 09:57:25 +0100
Subject: [PATCH 1/2] Update Travis CI configuration to be compatible with
 Ubuntu Xenial.

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09d77b6bc..cc4e3dfd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: generic
+dist: xenial
+services:
+  - xvfb
 
 addons:
   apt:
@@ -6,6 +9,7 @@ addons:
     - ccache
     - cmake
     - swig
+    - libglu1-mesa
 
 env:
   global:
@@ -37,9 +41,7 @@ cache:
 before_install:
   - mkdir -p "${HOME}/.cache/download"
   - if [[ ${TRAVIS_OS_NAME} == "linux" ]] ; then
-       export DISPLAY=:99.0;
        ccache -s;
-       sh -e /etc/init.d/xvfb start;
        ./ci/install-edm-linux.sh;
        export PATH="${HOME}/edm/bin:/usr/lib/ccache:${PATH}";
     else

From 28afd33ed356c4715fda7759d77d967acd7adebd Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Thu, 13 Jun 2019 10:20:34 +0100
Subject: [PATCH 2/2] CI is build enable from source, so we need the -dev
 package.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cc4e3dfd1..d9606b0d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ addons:
     - ccache
     - cmake
     - swig
-    - libglu1-mesa
+    - libglu1-mesa-dev
 
 env:
   global: