Merge branch 'development'

rrnewton · Oct 22, 2011 · 2deba11 · 2deba11
2 parents 0844318 + dca8a6d
commit 2deba11
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,9 @@
+Changes in version 2.9.4
+
+  * Require GHC >= 7.2
+
+  * Support Alex 3.x
+
 Changes in version 2.9.3
 
   [This is the version that comes with GHC 7.2.1 although it claims it's 2.9.2!]

diff --git 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.9.3, a Haskell
+      <para>This document describes Haddock version 2.9.4, a Haskell
       documentation tool.</para>
     </abstract>
   </bookinfo>

diff --git a/haddock.cabal b/haddock.cabal
@@ -1,18 +1,19 @@
 name:                 haddock
-version:              2.9.3
-cabal-version:        >= 1.10
+version:              2.9.4
+synopsis:             A documentation-generation tool for Haskell libraries
+description:          Haddock is a documentation-generation tool for Haskell
+                      libraries
 license:              BSD3
-build-type:           Simple
 license-file:         LICENSE
-copyright:            (c) Simon Marlow, David Waern
 author:               Simon Marlow, David Waern
 maintainer:           David Waern <david.waern@gmail.com>
-stability:            experimental
 homepage:             http://www.haskell.org/haddock/
-synopsis:             A documentation-generation tool for Haskell libraries
-description:          Haddock is a documentation-generation tool for Haskell
-                      libraries
-category:             Development
+bug-reports:          http://trac.haskell.org/haddock
+copyright:            (c) Simon Marlow, David Waern
+category:             Documentation
+build-type:           Simple
+cabal-version:        >= 1.10
+stability:            experimental
 
 extra-source-files:
   CHANGES
@@ -77,6 +78,7 @@ flag test
 
 executable haddock
   default-language:     Haskell2010
+  build-tools: alex >= 2.3, happy >= 1.18
   build-depends:
     base >= 4.3 && < 4.5,
     filepath,
@@ -86,7 +88,7 @@ executable haddock
     array,
     xhtml >= 3000.2 && < 3000.3,
     Cabal >= 1.10,
-    ghc >= 7.0 && < 7.4
+    ghc >= 7.2 && < 7.4
 
   if flag(in-ghc-tree)
     cpp-options: -DIN_GHC_TREE
@@ -137,6 +139,7 @@ executable haddock
 
 library
   default-language:     Haskell2010
+  build-tools: alex >= 2.3, happy >= 1.18
   build-depends:
     base >= 4.3 && < 4.5,
     filepath,
@@ -146,7 +149,7 @@ library
     array,
     xhtml >= 3000.2 && < 3000.3,
     Cabal >= 1.10,
-    ghc >= 7.0 && < 7.4
+    ghc >= 7.2 && < 7.4
 
   if flag(in-ghc-tree)
     cpp-options: -DIN_GHC_TREE
@@ -209,3 +212,6 @@ test-suite html-tests
   hs-source-dirs:   tests/html-tests
   build-depends:    base, directory, process, filepath, Cabal, regex-compat
 
+source-repository head
+  type:     git
+  location: http://darcs.haskell.org/haddock.git
diff --git a/haddock.spec b/haddock.spec
@@ -17,7 +17,7 @@
 # version label of your release tarball.
 
 %define name    haddock
-%define version 2.9.3
+%define version 2.9.4
 %define release 1
 
 Name:           %{name}

diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
@@ -66,14 +66,10 @@ binaryInterfaceMagic = 0xD0Cface
 -- because we store GHC datatypes in our interface files, we need to make sure
 -- we version our interface files accordingly.
 binaryInterfaceVersion :: Word16
-#if __GLASGOW_HASKELL__ == 700
-binaryInterfaceVersion = 16
-#elif __GLASGOW_HASKELL__ == 701
-binaryInterfaceVersion = 16
-#elif __GLASGOW_HASKELL__ == 702
-binaryInterfaceVersion = 16
+#if __GLASGOW_HASKELL__ == 702
+binaryInterfaceVersion = 17
 #elif __GLASGOW_HASKELL__ == 703
-binaryInterfaceVersion = 16
+binaryInterfaceVersion = 17
 #else
 #error Unknown GHC version
 #endif