filestore 0.6.0.5 → 0.6.0.6

raw patch · 6 files changed

+21/−7 lines, 6 filesdep ~filepathPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: filepath

API changes (from Hackage documentation)

Files

• CHANGES +5/−1
• Data/FileStore/Compat/Locale.hs +9/−0
• Data/FileStore/Darcs.hs +1/−1
• Data/FileStore/DarcsXml.hs +1/−1
• Data/FileStore/Mercurial.hs +1/−1
• filestore.cabal +4/−3

@@ -1,7 +1,11 @@+Version 0.6.0.6 released 2 April 2014++* Added compatibility module Data.FileStore.Compat.Locale+  so that filestore will compile against time 1.5.+ Version 0.6.0.5 released 2 April 2014  * Mark post-update as a bash script (not a generic shell script).-  Closes Debian #72323.  * Bump version bounds for dependencies. 

@@ -0,0 +1,9 @@+{-# LANGUAGE CPP #-}+module Data.FileStore.Compat.Locale ( defaultTimeLocale )+       where++#if MIN_VERSION_time(1,5,0)+import Data.Time.Format ( defaultTimeLocale )+#else+import System.Locale ( defaultTimeLocale )+#endif

@@ -17,7 +17,7 @@ import Control.Exception (throwIO) import Control.Monad (when) import Data.Time (formatTime)-import System.Locale (defaultTimeLocale)+import Data.FileStore.Compat.Locale (defaultTimeLocale) import Data.List (sort, isPrefixOf) #ifdef USE_MAXCOUNT import Data.List (isInfixOf)

@@ -3,7 +3,7 @@ import Data.Maybe (catMaybes, fromMaybe) import Data.Char (isSpace) import Data.Time.Format (parseTime)-import System.Locale (defaultTimeLocale)+import Data.FileStore.Compat.Locale (defaultTimeLocale) import Data.Time.Clock.POSIX (posixSecondsToUTCTime) import Text.XML.Light 

@@ -29,7 +29,7 @@ import System.FilePath ((</>), splitDirectories, takeFileName) import System.Directory (createDirectoryIfMissing, doesDirectoryExist) import Control.Exception (throwIO)-import System.Locale (defaultTimeLocale)+import Data.FileStore.Compat.Locale (defaultTimeLocale) import Data.Time (parseTime, formatTime)  -- | Return a filestore implemented using the mercurial distributed revision control system

@@ -1,5 +1,5 @@ Name:                filestore-Version:             0.6.0.5+Version:             0.6.0.6 Cabal-Version:       >= 1.10 Build-type:          Custom Synopsis:            Interface for versioning file stores.@@ -32,7 +32,7 @@                          bytestring >= 0.9 && < 1.0,                          containers >= 0.3 && < 0.6,                          utf8-string >= 0.3 && < 1.1,-                         filepath >= 1.1 && < 1.4,+                         filepath >= 1.1 && < 1.5,                          directory >= 1.0 && < 1.3,                          parsec >= 2 && < 3.2,                          process >= 1.0 && < 1.3,@@ -47,7 +47,8 @@                          Data.FileStore.Utils, Data.FileStore.Generic     Other-modules:       Paths_filestore,                          Data.FileStore.DarcsXml,-                         Data.FileStore.MercurialCommandServer+                         Data.FileStore.MercurialCommandServer,+                         Data.FileStore.Compat.Locale     Default-Extensions:  FlexibleInstances, CPP     Default-Language:    Haskell98     if flag(maxcount)