mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix OSX dmg to include libraries needed by bundled gpg, lost in last release.

Browse source
This commit is contained in:
Joey Hess 2016-03-07 12:55:01 -04:00
parent 9a8cdc3652
commit ab5f7b05f5
Failed to extract signature
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Build/OSXMkLibs.hs
View file

@ -49,6 +49,10 @@ installLibs appbase replacement_libs libmap = do
let fulllib = dropWhile (== '/') lib let fulllib = dropWhile (== '/') lib
let dest = appbase </> fulllib let dest = appbase </> fulllib
let symdest = appbase </> shortlib let symdest = appbase </> shortlib
-- This is a hack; libraries need to be in the same
-- directory as the program, so also link them into the
-- extra directory.
let symdestextra = appbase </> "extra" </> shortlib
ifM (doesFileExist dest) ifM (doesFileExist dest)
( return Nothing ( return Nothing
, do , do
@ -56,7 +60,8 @@ installLibs appbase replacement_libs libmap = do
putStrLn $ "installing " ++ pathlib ++ " as " ++ shortlib putStrLn $ "installing " ++ pathlib ++ " as " ++ shortlib
unlessM (boolSystem "cp" [File pathlib, File dest] unlessM (boolSystem "cp" [File pathlib, File dest]
<&&> boolSystem "chmod" [Param "644", File dest] <&&> boolSystem "chmod" [Param "644", File dest]
<&&> boolSystem "ln" [Param "-s", File fulllib, File symdest]) $ <&&> boolSystem "ln" [Param "-s", File fulllib, File symdest]
<&&> boolSystem "ln" [Param "-s", File (".." </> fulllib), File symdestextra]) $
error "library install failed" error "library install failed"
return $ Just appbase return $ Just appbase
) )

2
debian/changelog vendored
View file

@ -9,6 +9,8 @@ git-annex (6.20160230) UNRELEASED; urgency=medium
* Added dependencies on haskell mountpoints and disk-free-space * Added dependencies on haskell mountpoints and disk-free-space
libraries, removing FFI code from git-annex. libraries, removing FFI code from git-annex.
* dropkey: Add --batch and --json. * dropkey: Add --batch and --json.
* Fix OSX dmg to include libraries needed by bundled gpg,
lost in last release.
-- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400 -- Joey Hess <id@joeyh.name> Mon, 29 Feb 2016 13:00:30 -0400