From 8ad134ee712c7a4fe9907d729d958b6e8c5fb85b Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> Date: Tue, 23 Dec 2014 18:26:27 +0000 Subject: [PATCH] Make 2.15.0.1 release --- .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 ce6d680961..e8ccb510d7 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 a8155673e4..e3b76586fb 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 028ef5bf50..864164d608 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 bb14ee6aaa..d43b654abc 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 -- GitLab