[commit: packages/time] format-widths, improve-leapseconds, master, posix-perf, tasty, wip/travis: clean up deps (957955c)

[git at git.haskell.org]

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

On branches: format-widths,improve-leapseconds,master,posix-perf,tasty,wip/travis
Link       : http://git.haskell.org/packages/time.git/commitdiff/957955cbe73528d64b1ea8ba588ccda5dc799698

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

commit 957955cbe73528d64b1ea8ba588ccda5dc799698
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 7 01:59:59 2005 -0700

    clean up deps
    
    darcs-hash:20050807085959-ac6dd-d8e24b7b295204e276192302ff914792aec6e12c


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

957955cbe73528d64b1ea8ba588ccda5dc799698
 Data/Time/LocalTime/Format.hs    | 5 +----
 Data/Time/LocalTime/LocalTime.hs | 3 +--
 Makefile                         | 8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 75cd91b..9e3385a 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -11,10 +11,7 @@ module Data.Time.LocalTime.Format
 import Data.Time.LocalTime.LocalTime
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
-import Data.Time.Calendar.ISOWeekDay
-import Data.Time.Calendar.Gregorian
-import Data.Time.Calendar.YearDay
-import Data.Time.Calendar.Days
+import Data.Time.Calendar
 import Data.Time.Calendar.Private
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index cbfb0d8..541a47b 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -14,8 +14,7 @@ module Data.Time.LocalTime.LocalTime
 
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
-import Data.Time.Calendar.Gregorian
-import Data.Time.Calendar.Days
+import Data.Time.Calendar
 import Data.Time.Clock
 
 -- | A simple day and time aggregate, where the day is of the specified parameter,
diff --git a/Makefile b/Makefile
index 95d5dc7..218b096 100644
--- a/Makefile
+++ b/Makefile
@@ -127,18 +127,14 @@ Data/Time/LocalTime/TimeOfDay.o : Data/Time/Calendar/Private.hi
 Data/Time/LocalTime/TimeOfDay.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/LocalTime.hs
 Data/Time/LocalTime/LocalTime.o : Data/Time/Clock.hi
-Data/Time/LocalTime/LocalTime.o : Data/Time/Calendar/Days.hi
-Data/Time/LocalTime/LocalTime.o : Data/Time/Calendar/Gregorian.hi
+Data/Time/LocalTime/LocalTime.o : Data/Time/Calendar.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/Format.hs
 Data/Time/LocalTime/Format.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/Format.o : Data/Time/Clock.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar/Private.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/Days.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/YearDay.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/Gregorian.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/ISOWeekDay.hi
+Data/Time/LocalTime/Format.o : Data/Time/Calendar.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/LocalTime.hi