diff options
| -rw-r--r-- | Build/DesktopFile.hs | 3 | ||||
| -rw-r--r-- | CmdLine/Action.hs | 1 | ||||
| -rw-r--r-- | Database/Keys/SQL.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | git-annex.cabal | 2 | ||||
| -rw-r--r-- | standalone/no-th/evilsplicer-headers.hs | 1 |
6 files changed, 6 insertions, 7 deletions
diff --git a/Build/DesktopFile.hs b/Build/DesktopFile.hs index cb02d749c..cac520d77 100644 --- a/Build/DesktopFile.hs +++ b/Build/DesktopFile.hs @@ -20,13 +20,14 @@ import Utility.OSX import Assistant.Install.AutoStart import Assistant.Install.Menu -import Control.Applicative import System.Directory import System.Environment #ifndef mingw32_HOST_OS import System.Posix.User #endif import Data.Maybe +import Control.Applicative +import Prelude systemwideInstall :: IO Bool #ifndef mingw32_HOST_OS diff --git a/CmdLine/Action.hs b/CmdLine/Action.hs index 03acb04d7..60e108bee 100644 --- a/CmdLine/Action.hs +++ b/CmdLine/Action.hs @@ -13,7 +13,6 @@ import Common.Annex import qualified Annex import Annex.Concurrent import Types.Command -import qualified Annex.Queue import Messages.Concurrent import Messages.Internal import Types.Messages diff --git a/Database/Keys/SQL.hs b/Database/Keys/SQL.hs index 0560ac6a0..456b48e46 100644 --- a/Database/Keys/SQL.hs +++ b/Database/Keys/SQL.hs @@ -22,8 +22,6 @@ import Database.Persist.TH import Database.Esqueleto hiding (Key) import Data.Time.Clock import Control.Monad -import Control.Applicative -import Prelude share [mkPersist sqlSettings, mkMigrate "migrateKeysDb"] [persistLowerCase| Associated diff --git a/debian/changelog b/debian/changelog index f5a50db1c..4aa99b866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-annex (6.20151219) UNRELEASED; urgency=medium +git-annex (6.20160114) unstable; urgency=medium "hexapodia as the key insight" @@ -60,7 +60,7 @@ git-annex (6.20151219) UNRELEASED; urgency=medium * Windows: Fix rsync cross-drive hack to work with msys2 rsync. Thanks, Pieter Kitslaar. - -- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 13:31:17 -0400 + -- Joey Hess <id@joeyh.name> Thu, 14 Jan 2016 10:14:19 -0400 git-annex (5.20151218) unstable; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index 289e7a255..b5b588974 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20151218 +Version: 6.20160114 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <id@joeyh.name> diff --git a/standalone/no-th/evilsplicer-headers.hs b/standalone/no-th/evilsplicer-headers.hs index 1bc895370..64076d5f7 100644 --- a/standalone/no-th/evilsplicer-headers.hs +++ b/standalone/no-th/evilsplicer-headers.hs @@ -6,6 +6,7 @@ - ** DO NOT COMMIT ** -} import qualified Data.Monoid +import qualified Control.Applicative import qualified Data.Set import qualified Data.Set as Data.Set.Base import qualified Data.Map |