From 3a69e22b540d0dbd3f062e43e114ebfdf44ce68f Mon Sep 17 00:00:00 2001
From: bhack <s.fabri@email.it>
Date: Fri, 12 Sep 2014 19:50:15 +0200
Subject: [PATCH 1/3] Add ppa for gflag and glog

---
 scripts/travis/travis_install.sh | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/scripts/travis/travis_install.sh b/scripts/travis/travis_install.sh
index 15cafbe9b84..36c63b9d699 100755
--- a/scripts/travis/travis_install.sh
+++ b/scripts/travis/travis_install.sh
@@ -6,6 +6,7 @@ set -e
 MAKE="make --jobs=$NUM_THREADS"
 
 # Install apt packages where the Ubuntu 12.04 default works for Caffe
+add-apt-repository -y ppa:tuleu/precise-backports
 apt-get -y update
 apt-get install \
     wget git curl \
@@ -14,7 +15,7 @@ apt-get install \
     libboost-dev libboost-system-dev libboost-python-dev libboost-thread-dev \
     libprotobuf-dev protobuf-compiler \
     libatlas-dev libatlas-base-dev \
-    libhdf5-serial-dev \
+    libhdf5-serial-dev libgflags-dev libgoogle-glog-dev \
     bc
 
 # Add a special apt-repository to install CMake 2.8.9 for CMake Caffe build,
@@ -26,35 +27,6 @@ if $WITH_CMAKE; then
   apt-get -y install cmake
 fi
 
-# Install glog
-GLOG_URL=https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz
-GLOG_FILE=/tmp/glog-0.3.3.tar.gz
-pushd .
-wget $GLOG_URL -O $GLOG_FILE
-tar -C /tmp -xzvf $GLOG_FILE
-rm $GLOG_FILE
-cd /tmp/glog-0.3.3
-./configure
-$MAKE
-$MAKE install
-popd
-
-# Install gflags
-GFLAGS_URL=https://github.com/schuhschuh/gflags/archive/master.zip
-GFLAGS_FILE=/tmp/gflags-master.zip
-pushd .
-wget $GFLAGS_URL -O $GFLAGS_FILE
-cd /tmp/
-unzip gflags-master.zip
-cd gflags-master
-mkdir build
-cd build
-export CXXFLAGS="-fPIC"
-cmake ..
-$MAKE VERBOSE=1
-$MAKE install
-popd
-
 # Install CUDA, if needed
 if $WITH_CUDA; then
   CUDA_URL=http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1204/x86_64/cuda-repo-ubuntu1204_6.0-37_amd64.deb

From 503ac0b7892faa03b5633999c729a2641461b690 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Sun, 14 Sep 2014 21:16:38 +0200
Subject: [PATCH 2/3] Fix comments

---
 scripts/travis/travis_install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/travis/travis_install.sh b/scripts/travis/travis_install.sh
index 36c63b9d699..f1dc5a66516 100755
--- a/scripts/travis/travis_install.sh
+++ b/scripts/travis/travis_install.sh
@@ -5,8 +5,10 @@ set -e
 
 MAKE="make --jobs=$NUM_THREADS"
 
-# Install apt packages where the Ubuntu 12.04 default works for Caffe
-add-apt-repository -y ppa:tuleu/precise-backports
+# Install apt packages where the Ubuntu 12.04 default and ppa works for Caffe
+
+#This ppa is for gflags and glog
+add-aptrepository -y ppa:tuleu/precise-backports
 apt-get -y update
 apt-get install \
     wget git curl \

From 8de9ab04e832491adf06386a81de0f54f3d62422 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Sun, 14 Sep 2014 22:19:51 +0200
Subject: [PATCH 3/3] Fix a little typo

---
 scripts/travis/travis_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/travis/travis_install.sh b/scripts/travis/travis_install.sh
index f1dc5a66516..b1a59e09d95 100755
--- a/scripts/travis/travis_install.sh
+++ b/scripts/travis/travis_install.sh
@@ -7,8 +7,8 @@ MAKE="make --jobs=$NUM_THREADS"
 
 # Install apt packages where the Ubuntu 12.04 default and ppa works for Caffe
 
-#This ppa is for gflags and glog
-add-aptrepository -y ppa:tuleu/precise-backports
+# This ppa is for gflags and glog
+add-apt-repository -y ppa:tuleu/precise-backports
 apt-get -y update
 apt-get install \
     wget git curl \