[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, T6018-injective-type-families, adamse-D1033, clean, fix-travis, 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 down the version for master to 2.14.4 (5b81a9e)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:29:43 UTC 2015


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,fix-travis,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/5b81a9e53894d2ae591ca0c6c96199632d39eb06

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

commit 5b81a9e53894d2ae591ca0c6c96199632d39eb06
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Aug 14 20:19:07 2014 +0100

    Bump down the version for master to 2.14.4


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

5b81a9e53894d2ae591ca0c6c96199632d39eb06
 CHANGES                      | 2 +-
 doc/haddock.xml              | 2 +-
 haddock.cabal                | 6 +++---
 haddock.spec                 | 2 +-
 src/Haddock/InterfaceFile.hs | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 3814d09..832b398 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Changes in version 2.15.0
+Changes in version 2.14.4
 
  * Always read in prologue files as UTF8 (#286 and Cabal #1721)
 
diff --git a/doc/haddock.xml b/doc/haddock.xml
index 39a947c..573f1e3 100644
--- a/doc/haddock.xml
+++ b/doc/haddock.xml
@@ -21,7 +21,7 @@
       <holder>Simon Marlow, David Waern</holder>
     </copyright>
     <abstract>
-      <para>This document describes Haddock version 2.15.0, a Haskell
+      <para>This document describes Haddock version 2.14.4, a Haskell
       documentation tool.</para>
     </abstract>
   </bookinfo>
diff --git a/haddock.cabal b/haddock.cabal
index ef64526..3082214 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
 name:                 haddock
-version:              2.15.0
+version:              2.14.4
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -83,7 +83,7 @@ executable haddock
       array,
       xhtml >= 3000.2 && < 3000.3,
       Cabal >= 1.10,
-      ghc == 7.9.*,
+      ghc == 7.8.*,
       bytestring
 
     other-modules:
@@ -149,7 +149,7 @@ library
     array,
     xhtml >= 3000.2 && < 3000.3,
     Cabal >= 1.10,
-    ghc == 7.9.*
+    ghc == 7.8.*
 
   if flag(in-ghc-tree)
     cpp-options: -DIN_GHC_TREE
diff --git a/haddock.spec b/haddock.spec
index dd640f8..bdf9dcf 100644
--- a/haddock.spec
+++ b/haddock.spec
@@ -17,7 +17,7 @@
 # version label of your release tarball.
 
 %define name    haddock
-%define version 2.15.0
+%define version 2.14.4
 %define release 1
 
 Name:           %{name}
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index 4673f86..c13125e 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -76,7 +76,7 @@ binaryInterfaceMagic = 0xD0Cface
 -- (2) set `binaryInterfaceVersionCompatibility` to [binaryInterfaceVersion]
 --
 binaryInterfaceVersion :: Word16
-#if __GLASGOW_HASKELL__ == 709
+#if __GLASGOW_HASKELL__ == 708
 binaryInterfaceVersion = 25
 
 binaryInterfaceVersionCompatibility :: [Word16]



More information about the ghc-commits mailing list