[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, T6018-injective-type-families, adamse-D1033, clean, ghc-head, master, metainfo, v2.15, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Bump version to 2.15.0 and add version constraints (4dc4d3c)

[git at git.haskell.org]

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

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,ghc-head,master,metainfo,v2.15,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/4dc4d3cfa18d795f9b2bb7c5a3ac60ce29d8f279

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

commit 4dc4d3cfa18d795f9b2bb7c5a3ac60ce29d8f279
Author: Simon Hengel <sol at typeful.net>
Date:   Fri Aug 22 14:57:38 2014 +0800

    Bump version to 2.15.0 and add version constraints


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

4dc4d3cfa18d795f9b2bb7c5a3ac60ce29d8f279
 haddock-api/haddock-api.cabal | 4 ++--
 haddock.cabal                 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index c40edb1..71bf11f 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -1,5 +1,5 @@
 name:                 haddock-api
-version:              2.14.4
+version:              2.15.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -48,7 +48,7 @@ library
     , ghc == 7.8.3
 
     , ghc-paths
-    , haddock-library
+    , haddock-library == 1.1.0.*
 
   hs-source-dirs:
       src
diff --git a/haddock.cabal b/haddock.cabal
index 57f6d15..9939a35 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
 name:                 haddock
-version:              2.14.4
+version:              2.15.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -110,7 +110,7 @@ executable haddock
       Haddock.GhcUtils
       Haddock.Convert
   else
-    build-depends:  haddock-api, haddock-library
+    build-depends:  haddock-api == 2.15.0
 
 test-suite html-test
   type:             exitcode-stdio-1.0