From b4f3c7afeac6d0ee324e6bc84b53c87aa8995d5c Mon Sep 17 00:00:00 2001
From: Jule Slootbeek <jslootbeek@gmail.com>
Date: Thu, 17 Mar 2016 12:53:03 -0400
Subject: [PATCH 1/3] Switching Travis-CI environment on Trusty to match
 production environment.

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

diff --git a/.travis.yml b/.travis.yml
index 54dc879d..70811112 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: required
+dist: trusty
 language: python
 addons:
   postgresql: "9.3"

From a53e988d324f447f17c1207a7e27df58042bda48 Mon Sep 17 00:00:00 2001
From: Jule Slootbeek <jslootbeek@gmail.com>
Date: Thu, 17 Mar 2016 12:56:33 -0400
Subject: [PATCH 2/3] Add libgdal-dev as a requirement

Testing with the removal of ubuntugis

Adding libgdal-dev

Using correct libgdal1-dev package

Another libgdal1 test

Trying a libgdal workaround

Using built in postgresql

Install postgis-2.1

Testing without creating a test DB.

Final Travis CI settings. Hardcoded tag2 and tag3 IDs to avoid Duplicate Primary Keys with hardcoded tag1.id

Hardcode tag.id in other both Tests.
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 70811112..54dc879d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: required
-dist: trusty
 language: python
 addons:
   postgresql: "9.3"

From 24bc4e7e87ab5af48b1dddd6e574d09bcccd79a0 Mon Sep 17 00:00:00 2001
From: Jule Slootbeek <jslootbeek@gmail.com>
Date: Sun, 22 Jan 2017 14:04:43 -0500
Subject: [PATCH 3/3] Update Vagrantfile, install.sh and deploy.sh to run
 Ubuntu Xenial

---
 Vagrantfile |  4 +---
 deploy.sh   |  2 +-
 install.sh  | 23 ++++++++++++++++++-----
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 2cf5c0dc..b59afc6e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,9 +5,7 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  # Vagrant Cloud name for Ubuntu 14.04 LTS
-  config.vm.box = "ubuntu/trusty64"
-  config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+  config.vm.box = "https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-vagrant.box"
   config.vm.hostname = "roundware-server"
 
   # Configure Apache port 80 to forward to host 8080
diff --git a/deploy.sh b/deploy.sh
index 72b05dfe..8cb7eb5a 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -26,7 +26,7 @@ USERNAME="roundware"
 # Use vagrant username/directories used when available.
 if [ "$FOUND_VAGRANT" = true ]; then
   # Change the user to the vagrant default.
-  USERNAME="vagrant"
+  USERNAME="ubuntu"
 fi
 
 # Set paths/directories
diff --git a/install.sh b/install.sh
index f44a6f48..2e9f54c2 100755
--- a/install.sh
+++ b/install.sh
@@ -23,8 +23,8 @@ USERNAME="roundware"
 
 # Use vagrant username/directories used when available.
 if [ "$FOUND_VAGRANT" = true ]; then
-  # Change the user to the vagrant default.
-  USERNAME="vagrant"
+  # Change the user to the vagrant default. (ubuntu, in the case of the 16.04.1 image)
+  USERNAME="ubuntu"
 
   # Create a symbolic link in the user's directory to the code
   ln -sfn /vagrant /home/$USERNAME/roundware-server
@@ -68,10 +68,23 @@ apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get install -y \
 apache2 libapache2-mod-wsgi libav-tools mediainfo pacpl icecast2 \
 python-dev python-pip  python-dbus python-gst0.10 \
-gstreamer0.10-plugins-good gstreamer0.10-plugins-bad \
-gstreamer0.10-plugins-ugly gstreamer0.10-tools \
+gstreamer0.10-plugins-good \
+gstreamer0.10-tools \
 binutils libproj-dev gdal-bin libgdal-dev \
-postgresql-server-dev-9.3 postgresql-9.3-postgis-2.1
+postgresql-server-dev-9.5 postgresql-9.5-postgis-2.2 \
+libsidplay1v5
+
+# Download correct port of gstreamer-plugins-ugly/bad, for lame support
+# gstreamer0.10-plugins-ugly/bad were removed from Ubuntu 16.04 in favor of gstreamer1.0
+# via: https://launchpad.net/ubuntu/xenial/amd64/gstreamer0.10-plugins-ugly/0.10.19-2.1ubuntu4
+wget http://launchpadlibrarian.net/225705147/gstreamer0.10-plugins-ugly_0.10.19-2.1ubuntu4_amd64.deb
+
+# via: https://launchpad.net/ubuntu/xenial/amd64/gstreamer0.10-plugins-bad/0.10.23-8.1ubuntu3
+wget http://launchpadlibrarian.net/216017741/gstreamer0.10-plugins-bad_0.10.23-8.1ubuntu3_amd64.deb
+
+# install gstreamere-plugins-ugly/bad
+dpkg -i gstreamer0.10-plugins-ugly_0.10.19-2.1ubuntu4_amd64.deb
+dpkg -i gstreamer0.10-plugins-bad_0.10.23-8.1ubuntu3_amd64.deb
 
 # Install/upgrade virtualenv
 pip install -U virtualenv