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

OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by default.

Browse source
This commit is contained in:
Joey Hess 2013-12-13 14:25:24 -04:00
parent 75627390cd
commit d7ee0bdbb8
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Build/BundledPrograms.hs
View file

@ -29,8 +29,12 @@ bundledPrograms = catMaybes
, Just "xargs" , Just "xargs"
#endif #endif
, Just "rsync" , Just "rsync"
#ifndef darwin_HOST_OS
-- OS X has ssh installed by default.
-- (Linux probably, but not guaranteed.)
, Just "ssh" , Just "ssh"
, Just "ssh-keygen" , Just "ssh-keygen"
#endif
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
, Just "sh" , Just "sh"
#endif #endif

6
debian/changelog vendored
View file

@ -1,4 +1,4 @@
git-annex (5.20131131) UNRELEASED; urgency=low git-annex (5.20131213) unstable; urgency=low
* Avoid using git commit in direct mode, since in some situations * Avoid using git commit in direct mode, since in some situations
it will read the full contents of files in the tree. it will read the full contents of files in the tree.
@ -28,8 +28,10 @@ git-annex (5.20131131) UNRELEASED; urgency=low
* Fix direct mode's handling when modifications to non-annexed files * Fix direct mode's handling when modifications to non-annexed files
are pulled from a remote. A bug prevented the files from being updated are pulled from a remote. A bug prevented the files from being updated
in the work tree, and this caused the modification to be reverted. in the work tree, and this caused the modification to be reverted.
* OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by
default.
-- Joey Hess <joeyh@debian.org> Sun, 01 Dec 2013 13:57:58 -0400 -- Joey Hess <joeyh@debian.org> Fri, 13 Dec 2013 14:20:32 -0400
git-annex (5.20131130) unstable; urgency=low git-annex (5.20131130) unstable; urgency=low

2
git-annex.cabal
View file

@ -1,5 +1,5 @@
Name: git-annex Name: git-annex
Version: 5.20131130 Version: 5.20131213
Cabal-Version: >= 1.8 Cabal-Version: >= 1.8
License: GPL-3 License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net> Maintainer: Joey Hess <joey@kitenet.net>