Merge branch 'develop'

kaoskorobase · Sep 18, 2015 · 0358584 · 0358584
2 parents e1a6025 + cfc8fca
commit 0358584
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,16 @@
+sudo: false
 language: haskell
-ghc: 7.8, 7.10
+ghc:
+  - '7.4'
+  # - 7.8 # language-c fails to install
+  - '7.10' # Avoid 7.10 being parsed as float 7.1
+addons:
+  apt:
+    packages:
+    - libsndfile1-dev
+install:
+  - cabal install c2hs
+  - cabal install --enable-tests
 deploy:
   provider: hackage
   username: StefanKersten

diff --git a/ChangeLog.md → CHANGELOG.md b/ChangeLog.md → CHANGELOG.md
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ### Authors
 
-Copyright (c) Stefan Kersten 2007-2012 with contributions by
+Copyright (c) Stefan Kersten 2007-2015 with contributions by
 
 * Conrad Parker
 * Rohan Drape

diff --git a/Sound/File/Sndfile/Interface.chs b/Sound/File/Sndfile/Interface.chs
@@ -5,7 +5,7 @@ import qualified Control.Exception as E
 import           Control.Monad (liftM, when)
 import           Foreign hiding (unsafePerformIO)
 import           Foreign.C
-import qualified Sound.File.Sndfile.Exception	as E
+import qualified Sound.File.Sndfile.Exception as E
 import           System.IO.Unsafe (unsafePerformIO)
 
 #include <stdint.h>