[commit: packages/time] master, wip/travis: move out MonthDay and YearDay (6f8d525)

[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/6f8d525b72b83b9e7d6ae9a6a54412772827f04e

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

commit 6f8d525b72b83b9e7d6ae9a6a54412772827f04e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 27 19:15:30 2005 -0800

    move out MonthDay and YearDay
    
    darcs-hash:20051128031530-ac6dd-3f85b81566d7460fb2faa21f0783f11b4421cf62


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

6f8d525b72b83b9e7d6ae9a6a54412772827f04e
 Data/Time/Calendar.hs             | 4 ----
 Data/Time/Calendar/ISO8601Week.hs | 2 +-
 Data/Time/Calendar/MonthDay.hs    | 2 --
 Data/Time/Calendar/YearDay.hs     | 7 +------
 Data/Time/LocalTime/Format.hs     | 1 +
 Makefile                          | 3 +--
 TimeLib.cabal                     | 4 ++--
 7 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Data/Time/Calendar.hs b/Data/Time/Calendar.hs
index db87917..30dd9bf 100644
--- a/Data/Time/Calendar.hs
+++ b/Data/Time/Calendar.hs
@@ -3,12 +3,8 @@
 module Data.Time.Calendar
 (
 	module Data.Time.Calendar.Days,
-	module Data.Time.Calendar.YearDay,
-	module Data.Time.Calendar.MonthDay,
 	module Data.Time.Calendar.Gregorian
 ) where
 
 import Data.Time.Calendar.Days
-import Data.Time.Calendar.YearDay
-import Data.Time.Calendar.MonthDay
 import Data.Time.Calendar.Gregorian
diff --git a/Data/Time/Calendar/ISO8601Week.hs b/Data/Time/Calendar/ISO8601Week.hs
index 88e8e3e..59e082a 100644
--- a/Data/Time/Calendar/ISO8601Week.hs
+++ b/Data/Time/Calendar/ISO8601Week.hs
@@ -7,7 +7,7 @@ import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
 -- | convert to ISO 8601 Week format. First element of result is year, second week number (1-53), third day of week (1 for Monday to 7 for Sunday).
--- Note that "Week" years are not quite the same as Gregorian years, as the first day of the year is always a Monday.
+-- Note that \"Week\" years are not quite the same as Gregorian years, as the first day of the year is always a Monday.
 -- The first week of a year is the first week to contain at least four days in the corresponding Gregorian year.
 toISO8601Week :: Day -> (Integer,Int,Int)
 toISO8601Week date@(ModifiedJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger (mod d 7) + 1) where
diff --git a/Data/Time/Calendar/MonthDay.hs b/Data/Time/Calendar/MonthDay.hs
index 5f15d7d..ac0c4d3 100644
--- a/Data/Time/Calendar/MonthDay.hs
+++ b/Data/Time/Calendar/MonthDay.hs
@@ -1,9 +1,7 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- #hide
 module Data.Time.Calendar.MonthDay
 	(
-	-- * Month and day format
 	monthAndDayToDayOfYear,dayOfYearToMonthAndDay,monthLength
 	) where
 
diff --git a/Data/Time/Calendar/YearDay.hs b/Data/Time/Calendar/YearDay.hs
index f860810..f8673cc 100644
--- a/Data/Time/Calendar/YearDay.hs
+++ b/Data/Time/Calendar/YearDay.hs
@@ -1,11 +1,6 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- #hide
-module Data.Time.Calendar.YearDay
-	(
-	-- * Year and day format
-	module Data.Time.Calendar.YearDay
-	) where
+module Data.Time.Calendar.YearDay where
 
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 3fbbe0e..c459796 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -11,6 +11,7 @@ import Data.Time.LocalTime.LocalTime
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar.ISO8601Week
+import Data.Time.Calendar.YearDay
 import Data.Time.Calendar
 import Data.Time.Calendar.Private
 import Data.Time.Clock
diff --git a/Makefile b/Makefile
index b387425..30e47b9 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,6 @@ Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/MonthDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar.hs
 Data/Time/Calendar.o : Data/Time/Calendar/Gregorian.hi
-Data/Time/Calendar.o : Data/Time/Calendar/MonthDay.hi
-Data/Time/Calendar.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Days.hi
 Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/ISO8601Week.hs
 Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Private.hi
@@ -150,6 +148,7 @@ 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.hi
+Data/Time/LocalTime/Format.o : Data/Time/Calendar/YearDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar/ISO8601Week.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeOfDay.hi
diff --git a/TimeLib.cabal b/TimeLib.cabal
index 16a43c7..828074e 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -12,6 +12,8 @@ Synopsis:	a new time library
 Exposed-modules:
 	Data.Fixed,
 	Data.Time.Calendar,
+	Data.Time.Calendar.MonthDay,
+	Data.Time.Calendar.YearDay,
 	Data.Time.Calendar.ISO8601Week,
 	Data.Time.Calendar.Julian,
 	Data.Time.Calendar.Easter,
@@ -24,8 +26,6 @@ C-Sources:	timestuff.c
 Other-modules:
 	Data.Time.Calendar.Private,
 	Data.Time.Calendar.Days,
-	Data.Time.Calendar.YearDay,
-	Data.Time.Calendar.MonthDay,
 	Data.Time.Calendar.Gregorian,
 	Data.Time.Calendar.JulianYearDay,
 	Data.Time.Clock.Scale,