Bump version number to 1.1.6.2 (and add changelog entries)

23Skidoo · Apr 23, 2007 · 49fdfe1 · 49fdfe1
1 parent b7a01e2
commit 49fdfe1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Cabal.cabal b/Cabal.cabal
@@ -1,5 +1,5 @@
 Name: Cabal
-Version: 1.1.6.1
+Version: 1.1.6.2
 Copyright: 2003-2006, Isaac Jones
 -- For ghc 6.2 you need to add 'unix' to Build-Depends:
 Build-Depends: base

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ ifeq "$(findstring boilerplate.mk, $(wildcard $(TOP)/mk/*))" ""
 # ----------------------------------------------------------------------------
 # Standalone Makefile:
 
-CABALVERSION=1.1.6.1
+CABALVERSION=1.1.6.2
 #KIND=rc
 KIND=latest
 GHCFLAGS= --make -fno-warn-unused-matches -cpp
@@ -206,7 +206,7 @@ ALL_DIRS = \
 EXCLUDED_SRCS	= DefaultSetup.lhs Setup.lhs
 
 PACKAGE		= Cabal
-VERSION		= 1.1.6.1
+VERSION		= 1.1.6.2
 
 PACKAGE_DEPS	= base
 

diff --git a/changelog b/changelog
@@ -1,5 +1,10 @@
 -*-change-log-*-
 
+1.1.6.2  Ian Lynagh <igloo@earth.li> Apr 2007
+	* Fix compiling an executable for profiling with template haskell
+	* Fix C/Haskell type mismatches
+	* Set the Cabal version when building via the fptools build system
+
 1.1.6.1  Duncan Coutts <duncan.coutts@worc.ox.ac.uk> Oct 2006
 	* Fix escaping of ' chars in register.sh script.
 	* Fix getDataDir etc. when bindir=$prefix