From 32fb7ad9bb2ae6bf9f6c20483061375f69afe18d Mon Sep 17 00:00:00 2001
From: Michael Carlberg <c@rlberg.se>
Date: Thu, 15 Dec 2016 19:16:31 +0100
Subject: [PATCH] fix(ci): Installpackages using the apt addon

---
 .travis.yml                   | 19 ++++++++++++++++++-
 common/travis/install_deps.sh | 23 -----------------------
 2 files changed, 18 insertions(+), 24 deletions(-)
 delete mode 100755 common/travis/install_deps.sh

diff --git a/.travis.yml b/.travis.yml
index e1b449e9..21bcf966 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,28 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
       - llvm-toolchain-precise-3.8
+      - sourceline: "ppa:george-edison55/george-edison"
     packages:
       - gcc-5
       - g++-5
       - clang-3.8
+      - cmake
+      - cmake-data
+      - i3-wm
+      - libasound2-dev
+      - libboost-dev
+      - libfreetype6-dev
+      - libiw-dev
+      - libmpdclient-dev
+      - libxcb-ewmh-dev
+      - libxcb-icccm4-dev
+      - libxcb-image0-dev
+      - libxcb-randr0-dev
+      - libxcb-util0-dev
+      - libxcb-xkb-dev
+      - libxcb1-dev
+      - python-xcbgen
+      - xcb-proto
 
 env:
   global:
@@ -35,7 +53,6 @@ cache:
 
 install:
   - source ${TRAVIS_BUILD_DIR}/common/travis/environment.sh
-  - source ${TRAVIS_BUILD_DIR}/common/travis/install_deps.sh
   - source ${TRAVIS_BUILD_DIR}/common/travis/install_cmake.sh
   - source ${TRAVIS_BUILD_DIR}/common/travis/install_libcpp.sh
 
diff --git a/common/travis/install_deps.sh b/common/travis/install_deps.sh
deleted file mode 100755
index d4e23a84..00000000
--- a/common/travis/install_deps.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-sudo apt-add-repository -y "ppa:george-edison55/george-edison"
-sudo apt-get -qq update
-sudo apt-get install -y \
-  cmake cmake-data \
-  libboost-dev \
-  libxcb1-dev \
-  libxcb-ewmh-dev \
-  libxcb-icccm4-dev \
-  libxcb-image0-dev \
-  libxcb-randr0-dev \
-  libxcb-util0-dev \
-  libxcb-xkb-dev \
-  xcb-proto \
-  python-xcbgen \
-  libfreetype6-dev
-
-# optdepends
-sudo apt-get install -y \
-  i3-wm \
-  libiw-dev \
-  libasound2-dev \
-  libmpdclient-dev