[commit: packages/time] master,wip/travis: clean up cabal (f3549c0)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/time

On branches: master,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/f3549c01321318e863201c60fbab1cae0d7009c0

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

commit f3549c01321318e863201c60fbab1cae0d7009c0
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 28 22:26:12 2012 -0700

    clean up cabal
    
    Ignore-this: 5e5b69183c6e72366a4dd98122daa5ef
    
    darcs-hash:20121029052612-ac6dd-bcb9e948acbc01ea8ce0964bcbdd20afe27d0796


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

f3549c01321318e863201c60fbab1cae0d7009c0
 Setup.hs   | 10 ----------
 time.cabal | 14 ++++++++------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
index 26fdbce..0000000
--- a/Setup.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-module Main (main) where
-
-import Distribution.Simple
-import System.Info
-
-main :: IO ()
-main = case os of
-    "windows" -> defaultMain
-    "mingw32" -> defaultMain
-    _ -> defaultMainWithHooks autoconfUserHooks
diff --git a/time.cabal b/time.cabal
index ec13915..6574f89 100644
--- a/time.cabal
+++ b/time.cabal
@@ -9,7 +9,7 @@ homepage:       http://semantic.org/TimeLib/
 synopsis:       A time library
 description:    A time library
 category:       System
-build-type:     Custom
+build-type:     Configure
 cabal-version:  >=1.16
 x-follows-version-policy:
 
@@ -34,16 +34,17 @@ extra-tmp-files:
     include/HsTimeConfig.h
 
 library
-    Build-Depends: base >= 4,
+    build-depends: base >= 4,
                    deepseq >= 1.1,
                    old-locale
     ghc-options: -Wall
+    default-language: Haskell2010
     if impl(ghc)
-        extensions: Rank2Types DeriveDataTypeable StandaloneDeriving
+        default-extensions: Rank2Types DeriveDataTypeable StandaloneDeriving
         cpp-options: -DLANGUAGE_Rank2Types -DLANGUAGE_DeriveDataTypeable -DLANGUAGE_StandaloneDeriving
     else
         if impl(hugs)
-            extensions: Rank2Types
+            default-extensions: Rank2Types
             cpp-options: -DLANGUAGE_Rank2Types
     if os(windows)
         build-depends: Win32
@@ -60,7 +61,7 @@ library
         Data.Time.LocalTime,
         Data.Time.Format,
         Data.Time
-    extensions:    ForeignFunctionInterface, CPP
+    default-extensions:    CPP
     c-sources:    cbits/HsTime.c
     other-modules:
         Data.Time.Calendar.Private,
@@ -87,7 +88,8 @@ library
 Test-Suite tests
   type: detailed-0.9
   test-module: Test.Tests
-  extensions: Rank2Types, ForeignFunctionInterface, CPP, DeriveDataTypeable, StandaloneDeriving 
+  default-language: Haskell2010
+  default-extensions: Rank2Types, CPP, DeriveDataTypeable, StandaloneDeriving 
   cpp-options: -DLANGUAGE_Rank2Types -DLANGUAGE_DeriveDataTypeable -DLANGUAGE_StandaloneDeriving
   c-sources: cbits/HsTime.c Test/TestFormatStuff.c
   include-dirs: include