[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, v2.15: Make 2.15.0.1 release (8ad134e)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.15,2.15.0.1,2.15.0.2,v2.15
Link       : http://git.haskell.org/haddock.git/commitdiff/8ad134ee712c7a4fe9907d729d958b6e8c5fb85b

>---------------------------------------------------------------

commit 8ad134ee712c7a4fe9907d729d958b6e8c5fb85b
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Tue Dec 23 18:26:27 2014 +0000

    Make 2.15.0.1 release


>---------------------------------------------------------------

8ad134ee712c7a4fe9907d729d958b6e8c5fb85b
 .travis.yml                   | 1 +
 CHANGES                       | 4 ++++
 haddock-api/haddock-api.cabal | 2 +-
 haddock.cabal                 | 6 +++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce6d680..e8ccb51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: haskell
 env:
  - GHCVER=7.8.2
  - GHCVER=7.8.3
+ - GHCVER=7.8.4
 
 before_install:
  - sudo add-apt-repository -y ppa:hvr/ghc
diff --git a/CHANGES b/CHANGES
index a815567..e3b7658 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Changes in version 2.15.0.1
+
+ * This release is identical to 2.15.0 except the GHC version bound.
+
 Changes in version 2.15.0
 
  * Always read in prologue files as UTF8 (#286 and Cabal #1721)
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index 028ef5b..864164d 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -45,7 +45,7 @@ library
     , array
     , xhtml >= 3000.2 && < 3000.3
     , Cabal >= 1.10
-    , ghc >= 7.8.2 && < 7.8.4
+    , ghc >= 7.8.2 && <= 7.8.4
 
     , ghc-paths
     , haddock-library == 1.1.1.*
diff --git a/haddock.cabal b/haddock.cabal
index bb14ee6..d43b654 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
 name:                 haddock
-version:              2.15.0
+version:              2.15.0.1
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -57,7 +57,7 @@ executable haddock
       array,
       xhtml >= 3000.2 && < 3000.3,
       Cabal >= 1.10,
-      ghc == 7.8.3,
+      ghc >= 7.8.2 && <= 7.8.4,
       bytestring
 
     other-modules:
@@ -108,7 +108,7 @@ executable haddock
       Haddock.GhcUtils
       Haddock.Convert
   else
-    build-depends:  haddock-api == 2.15.0
+    build-depends:  haddock-api == 2.15.0.1
 
 test-suite html-test
   type:             exitcode-stdio-1.0