From c01c776e94884121334860a8692afcb25406f8a6 Mon Sep 17 00:00:00 2001
From: Stefan Dresselhaus <sdressel@techfak.uni-bielefeld.de>
Date: Mon, 20 Jan 2014 15:03:20 +0100
Subject: [PATCH] sdl2 (raw) not used due to clash with SDL2 (hsSDL2),
 packet-dependencies removed until further problems reoccour

---
 Pioneers.cabal  |  1 -
 deps/getDeps.sh | 34 +++++++++++++++++-----------------
 src/Main.hs     |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Pioneers.cabal b/Pioneers.cabal
index ba17030..d21f9c2 100644
--- a/Pioneers.cabal
+++ b/Pioneers.cabal
@@ -28,6 +28,5 @@ executable Pioneers
                    distributive >=0.3.2 && <0.4,
                    linear >=1.3.1 && <1.4,
                    lens >=3.10.1 && <3.11,
-                   sdl2 >= 1.0.2 && <2.0,
                    SDL2 >= 0.1.0
 
diff --git a/deps/getDeps.sh b/deps/getDeps.sh
index b789875..c14f278 100755
--- a/deps/getDeps.sh
+++ b/deps/getDeps.sh
@@ -29,21 +29,21 @@ done
 
 #hack until saucy has 2.0.1 instead of 2.0.0
 
-dialog --yesno "Install libSDL2.0.1 from ubuntu trusty?\nCurrently needed for saucy as they only serve 2.0.0 in the repos" 10 50
-install=${?}
-
-if [[ $install -eq 0 ]]
-then
-	echo "installing libsdl2.0.1"
-	if [ ! -f "libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb" ]
-	then
-		wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb
-		sudo dpkg -i libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb
-	fi
-	if [ ! -f "libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb" ]
-	then
-		wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb
-		sudo dpkg -i libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb
-	fi
-fi
+#dialog --yesno "Install libSDL2.0.1 from ubuntu trusty?\nCurrently needed for saucy as they only serve 2.0.0 in the repos" 10 50
+#install=${?}
+#
+#if [[ $install -eq 0 ]]
+#then
+#	echo "installing libsdl2.0.1"
+#	if [ ! -f "libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb" ]
+#	then
+#		wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb
+#		sudo dpkg -i libsdl2-2.0-0_2.0.1+dfsg1-1ubuntu1_amd64.deb
+#	fi
+#	if [ ! -f "libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb" ]
+#	then
+#		wget http://de.archive.ubuntu.com/ubuntu/pool/universe/libs/libsdl2/libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb
+#		sudo dpkg -i libsdl2-dev_2.0.1+dfsg1-1ubuntu1_amd64.deb
+#	fi
+#fi
 
diff --git a/src/Main.hs b/src/Main.hs
index 971587c..46f4bc1 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -22,7 +22,7 @@ import           Control.Lens                         (transposeOf, (^.))
 import           Linear                               as L
 
 -- GUI
-import Graphics.UI.SDL
+import           Graphics.UI.SDL
 
 -- Render
 import qualified Graphics.Rendering.OpenGL.GL         as GL