diff options
| -rw-r--r-- | Build/EvilSplicer.hs | 2 | ||||
| -rw-r--r-- | Build/OSXMkLibs.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs index f40d10033..35dba4968 100644 --- a/Build/EvilSplicer.hs +++ b/Build/EvilSplicer.hs @@ -584,7 +584,7 @@ text_builder_hack = replace "Data.Text.Lazy.Builder.Internal.fromText" "Data.Tex parsecAndReplace :: Parser String -> String -> String parsecAndReplace p s = case parse find "" s of Left e -> s - Right l -> concatMap (either (\c -> [c]) id) l + Right l -> concatMap (either return id) l where find :: Parser [Either Char String] find = many $ try (Right <$> p) <|> (Left <$> anyChar) diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs index ed12a945f..dae9bc0ae 100644 --- a/Build/OSXMkLibs.hs +++ b/Build/OSXMkLibs.hs @@ -144,7 +144,7 @@ getLibName lib libmap = case M.lookup lib libmap of Just n -> (n, libmap) Nothing -> (nextfreename, M.insert lib nextfreename libmap) where - names = map (\c -> [c]) ['A' .. 'Z'] ++ + names = map pure ['A' .. 'Z'] ++ [[n, l] | n <- ['0' .. '9'], l <- ['A' .. 'Z']] used = S.fromList $ M.elems libmap nextfreename = fromMaybe (error "ran out of short library names!") $ diff --git a/debian/changelog b/debian/changelog index f8d49df09..94c68b42c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-annex (4.20131102) UNRELEASED; urgency=low +git-annex (4.20131106) unstable; urgency=low * Improve local pairing behavior when two computers both try to start the pairing process separately. @@ -12,8 +12,9 @@ git-annex (4.20131102) UNRELEASED; urgency=low * Fix zombie process that occurred when switching between repository views in the webapp. * map: Work when there are gcrypt remotes. + * Fix build w/o webapp. - -- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400 + -- Joey Hess <joeyh@debian.org> Wed, 06 Nov 2013 11:17:47 -0400 git-annex (4.20131101) unstable; urgency=low diff --git a/git-annex.cabal b/git-annex.cabal index 2498bf106..ef0259e7a 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 4.20131101 +Version: 4.20131106 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> |