From 2b948f6297befc463493f78fdfdd995b2cbabe10 Mon Sep 17 00:00:00 2001 From: David Waern Date: Sat, 1 Oct 2011 02:19:10 +0200 Subject: Improve .cabal file --- haddock.cabal | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'haddock.cabal') diff --git a/haddock.cabal b/haddock.cabal index e767e397..519301fc 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,18 +1,19 @@ name: haddock version: 2.9.3 -cabal-version: >= 1.10 +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 -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 @@ -209,3 +210,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 -- cgit v1.2.3 From 754413bb131a8cf4bda3b9bd959d44d2b347c1cc Mon Sep 17 00:00:00 2001 From: David Waern Date: Tue, 4 Oct 2011 00:18:17 +0200 Subject: Requre ghc >= 7.2 --- haddock.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'haddock.cabal') diff --git a/haddock.cabal b/haddock.cabal index 519301fc..ff0fa9a1 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -87,7 +87,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 @@ -147,7 +147,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 -- cgit v1.2.3 From 8301dd47670a2377474d96ce55ce977b3a8d7c03 Mon Sep 17 00:00:00 2001 From: David Waern Date: Tue, 4 Oct 2011 00:22:50 +0200 Subject: Bump version to 2.9.4 --- CHANGES | 6 ++++++ doc/haddock.xml | 2 +- haddock.cabal | 2 +- haddock.spec | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'haddock.cabal') diff --git a/CHANGES b/CHANGES index 7f65c913..a9014e75 100644 --- 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 index d444be5f..5ec97c95 100644 --- a/doc/haddock.xml +++ b/doc/haddock.xml @@ -21,7 +21,7 @@ Simon Marlow, David Waern - This document describes Haddock version 2.9.3, a Haskell + This document describes Haddock version 2.9.4, a Haskell documentation tool. diff --git a/haddock.cabal b/haddock.cabal index ff0fa9a1..604e6bd5 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -1,5 +1,5 @@ name: haddock -version: 2.9.3 +version: 2.9.4 synopsis: A documentation-generation tool for Haskell libraries description: Haddock is a documentation-generation tool for Haskell libraries diff --git a/haddock.spec b/haddock.spec index 95617a37..049192e7 100644 --- 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} -- cgit v1.2.3 From 2eb873b5191eee0ffb5094068ab8f0d580453299 Mon Sep 17 00:00:00 2001 From: David Waern Date: Thu, 6 Oct 2011 02:30:21 +0200 Subject: Add alex and happy to build-tools. --- haddock.cabal | 2 ++ 1 file changed, 2 insertions(+) (limited to 'haddock.cabal') diff --git a/haddock.cabal b/haddock.cabal index 604e6bd5..221d7245 100644 --- a/haddock.cabal +++ b/haddock.cabal @@ -78,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, @@ -138,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, -- cgit v1.2.3