diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-13 14:25:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-13 14:25:24 -0400 |
| commit | 49bbf18e68a78f03cd3a992b53f0e13f0a7bfa38 (patch) | |
| tree | 9b07b3ea34c25572f460ee194922bd49ffa51a7f | |
| parent | bede36dfc8a10d420adc25b869087146cfee3fd7 (diff) | |
OSX: Remove ssh and ssh-keygen from dmg as they're included in OSX by default.5.20131213
| -rw-r--r-- | Build/BundledPrograms.hs | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index e875c4e96..ae49f3061 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -29,8 +29,12 @@ bundledPrograms = catMaybes , Just "xargs" #endif , Just "rsync" +#ifndef darwin_HOST_OS + -- OS X has ssh installed by default. + -- (Linux probably, but not guaranteed.) , Just "ssh" , Just "ssh-keygen" +#endif #ifndef mingw32_HOST_OS , Just "sh" #endif diff --git a/debian/changelog b/debian/changelog index 8af731481..da3117326 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 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 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. + * 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 diff --git a/git-annex.cabal b/git-annex.cabal index 3d1c0b211..0cbd5f16f 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 5.20131130 +Version: 5.20131213 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net> |