[commit: hpc] master: Bump base lower version to 4.5 (the version GHC 7.4.1 came with) (02d402f)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/hpc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/02d402f04b2af44dd95340f1d64e81a3fcac049d

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

commit 02d402f04b2af44dd95340f1d64e81a3fcac049d
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Nov 30 21:57:56 2012 +0000

    Bump base lower version to 4.5 (the version GHC 7.4.1 came with)
    
    and remove code to support older versions

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

 Trace/Hpc/Mix.hs      |    2 +-
 Trace/Hpc/Reflect.hsc |   20 +-------------------
 Trace/Hpc/Tix.hs      |    2 +-
 Trace/Hpc/Util.hs     |    2 +-
 hpc.cabal             |   16 +++++-----------
 5 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/Trace/Hpc/Mix.hs b/Trace/Hpc/Mix.hs
index d1533e2..0b05f51 100644
--- a/Trace/Hpc/Mix.hs
+++ b/Trace/Hpc/Mix.hs
@@ -1,4 +1,4 @@
-#if __GLASGOW_HASKELL__ >= 701
+#ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE Trustworthy #-}
 #endif
 ---------------------------------------------------------------
diff --git a/Trace/Hpc/Reflect.hsc b/Trace/Hpc/Reflect.hsc
index 4b29542..16b27ca 100644
--- a/Trace/Hpc/Reflect.hsc
+++ b/Trace/Hpc/Reflect.hsc
@@ -1,5 +1,5 @@
 {-# LANGUAGE ForeignFunctionInterface #-}
-#if __GLASGOW_HASKELL__ >= 701
+#ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE Trustworthy #-}
 #endif
 
@@ -11,22 +11,6 @@ module Trace.Hpc.Reflect
 
 import Trace.Hpc.Tix
 
-#if __GLASGOW_HASKELL__ < 608
-
--- Older GHCs don't have the info in the header files for the real
--- contents of this module to compile
-
-clearTix :: IO ()
-clearTix = error "clearTix not defined for GHC < 6.8"
-
-examineTix :: IO Tix
-examineTix = error "examineTix not defined for GHC < 6.8"
-
-updateTix :: Tix -> IO ()
-updateTix = error "updateTix not defined for GHC < 6.8"
-
-#else
-
 import Foreign.C.String
 import Foreign.Marshal.Array
 import Foreign.Ptr
@@ -94,5 +78,3 @@ updateTix (Tix modTixes)
 		]
       return ()
 
-#endif
-
diff --git a/Trace/Hpc/Tix.hs b/Trace/Hpc/Tix.hs
index 6e0d10a..a30237f 100644
--- a/Trace/Hpc/Tix.hs
+++ b/Trace/Hpc/Tix.hs
@@ -1,4 +1,4 @@
-#if __GLASGOW_HASKELL__ >= 701
+#ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE Safe #-}
 #endif
 ------------------------------------------------------------
diff --git a/Trace/Hpc/Util.hs b/Trace/Hpc/Util.hs
index ae88aca..8365da2 100644
--- a/Trace/Hpc/Util.hs
+++ b/Trace/Hpc/Util.hs
@@ -1,4 +1,4 @@
-#if __GLASGOW_HASKELL__ >= 701
+#ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------
diff --git a/hpc.cabal b/hpc.cabal
index 95bd80e..b41e42d 100644
--- a/hpc.cabal
+++ b/hpc.cabal
@@ -1,5 +1,5 @@
 name:         hpc
-version:      0.6.0.0
+version:      0.6.0.1
 -- GHC 7.6.1 released with 0.6.0.0
 license:      BSD3
 license-file: LICENSE
@@ -15,9 +15,6 @@ source-repository head
     type:     git
     location: http://darcs.haskell.org/packages/hpc.git/
 
-Flag small_base
-  Description: Choose the new smaller, split-up base package.
-
 Library
     exposed-modules:
         Trace.Hpc.Util
@@ -25,12 +22,9 @@ Library
         Trace.Hpc.Tix
         Trace.Hpc.Reflect
     extensions: CPP
-    if flag(small_base)
-        Build-Depends: base       >= 3   && < 5,
-                       directory  >= 1   && < 1.3,
-                       time                 < 1.5,
-                       containers >= 0.1 && < 0.6
-    else
-        Build-Depends: base < 3
+    Build-Depends: base       >= 4.5 && < 5,
+                   directory  >= 1   && < 1.3,
+                   time                 < 1.5,
+                   containers >= 0.1 && < 0.6
     ghc-options: -Wall