From 0542a852044a2c0e39d66c8e121501a2135c8e8d Mon Sep 17 00:00:00 2001
From: Guillaume P <guillaume.pascal43@laposte.net>
Date: Thu, 10 Apr 2014 08:41:02 +0200
Subject: [PATCH] Clean up and re-enable notifications in travis config.

---
 .travis.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 075503c0a..3f59953b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,28 +11,29 @@ compiler:
 #  only:
 #    - master
 before_install:
-  # UPDATE REPOS
+  # Update repos
   - sudo apt-get update -qq
-  # INSTALL DEPENDENCIES
-  - sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libgl1-mesa-dev libglu1-mesa-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
+  # Install dependencies
+  - sudo apt-get install build-essential cmake libogg-dev libvorbis-dev libopenal-dev libxxf86vm-dev libcurl4-openssl-dev libfribidi-dev libbluetooth-dev
+  # Install mesa from an other repo (a newer version is required)
   - sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu quantal main restricted"
   - sudo apt-get update -qq
   - sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev
 script:
-  #  BUILD COMMANDS
+  #  Build commands
   - mkdir build
   - cd build
   - cmake .. -DCMAKE_BUILD_TYPE=Debug
   - make VERBOSE=1 -j 4 
-# notifications:
-  # irc:
-    # channels:
-      # - "irc.freenode.org#stk"
-    # skip_join: false
-    # use_notice: true
-    # template:
-      # #- "[%{commit}: %{author}] %{message}"
-      # #- "%{build_url}"
-      # - "[%{repository}#%{branch} @%{commit}] %{author}): %{message}"
-      # - "Diff: %{compare_url}"
-      # - "Build: %{build_url}"
+notifications:
+  irc:
+    channels:
+      - "irc.freenode.org#stk"
+    skip_join: false
+    use_notice: true
+    template:
+      #- "[%{commit}: %{author}] %{message}"
+      #- "%{build_url}"
+      - "[%{repository}#%{branch} @%{commit}] %{author}): %{message}"
+      - "Diff: %{compare_url}"
+      - "Build: %{build_url}"