From 3f9aeba944a541f16f0c57b8a275a6321dbf5610 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 22 Nov 2015 12:17:31 -0500
Subject: [PATCH 1/3] Revert "Select Ruby 2.1.1"

This reverts commit 50c07f7da52df487e5099be00e74ee63a6f3a640.
---
 .travis.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b8a43d8..b1525f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: cpp
 
+rvm:
+  - rbx-2.1.1
+
 git:
   depth: 500
 
@@ -66,9 +69,9 @@ cache:
 
 before_install:
   - cd ${TRAVIS_BUILD_DIR} && git fetch --unshallow && git fetch --all --tags
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then rvm install 2.1.1 && mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/; fi
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then mkdir -p ~/.config/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/.config/QtProject/; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then mkdir -p ~/Library/Preferences/QtProject/ && cp ${TRAVIS_BUILD_DIR}/test/qtlogging.ini ~/Library/Preferences/QtProject/; fi
-  - if [ "${TRAVIS_OS_NAME}" = "android" ]; then rvm install 2.1.1 && wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 && mkdir -p ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 && tar jxf gstreamer-1.0-android-armv7-1.5.2.tar.bz2 -C ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2; fi
+  - if [ "${TRAVIS_OS_NAME}" = "android" ]; then wget https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 && mkdir -p ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 && tar jxf gstreamer-1.0-android-armv7-1.5.2.tar.bz2 -C ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2; fi
 
 install:
   - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" != "doxygen" ]]; then

From 9ffb93161e0114864bbaa3875ab28adfef698046 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 22 Nov 2015 12:17:34 -0500
Subject: [PATCH 2/3] Revert "Set Ruby to 2.x to fix Android deploy
 dependencies"

This reverts commit aaf746d14739d40d1d4fb0f9ff72c132a8207490.
---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1525f4..8f24e27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,5 @@
 language: cpp
 
-rvm:
-  - rbx-2.1.1
-
 git:
   depth: 500
 

From f65a0f3667616c4532c21c486d5004244bf2d7bf Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 22 Nov 2015 12:19:09 -0500
Subject: [PATCH 3/3] travis-ci force mime-types version for deploy

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

diff --git a/.travis.yml b/.travis.yml
index 8f24e27..b4a5ad8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -128,6 +128,9 @@ after_success:
       ;
     fi
 
+before_deploy:
+  - rvm 1.9.3 do gem install mime-types -v 2.6.2
+
 deploy:
   - provider: s3
     access_key_id: AKIAIVORNALE7NHD3T6Q