[commit: packages/time] master, wip/travis: Data.Time.Format.Parse re-exports System.Locale. Bump to 1.5 for this. (f1853e7)

[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/f1853e7ecb323df073606a028898fdfe0a5933e6

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

commit f1853e7ecb323df073606a028898fdfe0a5933e6
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 10 02:46:16 2014 -0700

    Data.Time.Format.Parse re-exports System.Locale. Bump to 1.5 for this.


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

f1853e7ecb323df073606a028898fdfe0a5933e6
 Data/Time/Format.hs       | 1 -
 Data/Time/Format/Parse.hs | 4 +++-
 Test/TestEaster.hs        | 2 --
 Test/TestFormat.hs        | 1 -
 Test/TestParseTime.hs     | 1 -
 time.cabal                | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Data/Time/Format.hs b/Data/Time/Format.hs
index 21bce35..d071c30 100644
--- a/Data/Time/Format.hs
+++ b/Data/Time/Format.hs
@@ -14,7 +14,6 @@ import Data.Time.Calendar.Private
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
 
-import System.Locale
 import Data.Maybe
 import Data.Char
 import Data.Fixed
diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index f9cc33d..c0569ee 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -8,7 +8,9 @@ module Data.Time.Format.Parse
 #if LANGUAGE_Rank2Types
     parseTime, readTime, readsTime,
 #endif
-    ParseTime(..)
+    ParseTime(..),
+    -- * Locale
+    module System.Locale
     ) where
 
 import Data.Time.Clock.POSIX
diff --git a/Test/TestEaster.hs b/Test/TestEaster.hs
index 20c8889..afba44c 100644
--- a/Test/TestEaster.hs
+++ b/Test/TestEaster.hs
@@ -6,8 +6,6 @@ import Data.Time.Calendar.Easter
 import Data.Time.Calendar
 import Data.Time.Format
 
-import System.Locale
-
 import Test.TestUtil
 import Test.TestEasterRef
 
diff --git a/Test/TestFormat.hs b/Test/TestFormat.hs
index fe5f375..68b8d2f 100644
--- a/Test/TestFormat.hs
+++ b/Test/TestFormat.hs
@@ -5,7 +5,6 @@ module Test.TestFormat where
 import Data.Time
 import Data.Time.Clock.POSIX
 import Data.Char
-import System.Locale
 import Foreign
 import Foreign.C
 import Control.Exception;
diff --git a/Test/TestParseTime.hs b/Test/TestParseTime.hs
index 7ddf400..fcb7421 100644
--- a/Test/TestParseTime.hs
+++ b/Test/TestParseTime.hs
@@ -10,7 +10,6 @@ import Data.Time
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
 import Data.Time.Clock.POSIX
-import System.Locale
 import Test.QuickCheck hiding (Result,reason)
 import Test.QuickCheck.Property hiding (result)
 import Test.TestUtil hiding (Result)
diff --git a/time.cabal b/time.cabal
index 1b71b00..d41b553 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.4.2.1
+version:        1.5
 stability:      stable
 license:        BSD3
 license-file:   LICENSE