diff --git a/.travis.yml b/.travis.yml index ce6d680961beb846766d619f3726389b8014ae75..e8ccb510d7ead48ab050a8a0bc6c657dbbd60c93 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 a8155673e4ba0d05095758f51e2c7a569c4b857b..e3b76586fbf045cc15c1254ae5790851b79fea3d 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 028ef5bf50ac4a15c216e1eed12a2a176a967d4e..864164d608a8b741cf8ebdd078f812e20e9586e2 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 bb14ee6aaa51c81d2fdec1af3ad21ca9ccfd4466..d43b654abcddc0147270b765cc2dc27141def2d2 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