Merge branch 'master' of ssh://git-annex.branchable.com

Build/BundledPrograms.hs

@@ -45,7 +45,12 @@ bundledPrograms = catMaybes
 #endif
 	, SysConfig.gpg
 	, ifset SysConfig.curl "curl"
+#ifndef darwin_HOST_OS
+	-- wget on OSX has been problimatic, looking for certs in the wrong
+	-- places. Don't ship it, use curl or the OSX's own wget if it has
+	-- one.
 	, ifset SysConfig.wget "wget"
+#endif
 	, ifset SysConfig.bup "bup"
 	, SysConfig.lsof
 	, SysConfig.gcrypt

Makefile

@@ -140,7 +140,7 @@ OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle
 osxapp: Build/Standalone Build/OSXMkLibs
 	$(MAKE) git-annex
 
-	rm -rf "$(OSXAPP_DEST)"
+	rm -rf "$(OSXAPP_DEST)" "$(OSXAPP_BASE)"
 	install -d tmp/build-dmg
 	cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)"
 

debian/changelog

@@ -2,6 +2,9 @@ git-annex (5.20140406) UNRELEASED; urgency=medium
 
   * importfeed: Filename template can now contain an itempubdate variable.
     Needs feed 0.3.9.2.
+  * Remove wget from OSX dmg, due to issues with cert paths that broke
+    git-annex automatic upgrading. Instead, curl is used, unless the
+    OSX system has wget installed, which will then be used.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 07 Apr 2014 16:22:02 -0400
 

doc/assistant/release_notes.mdwn

@@ -1,3 +1,11 @@
+## version 5.20140406
+
+Automatic upgrading was broken on OSX for previous versions. This has been
+fixed, but you'll need to manually upgrade to this version to get it going
+again. (Note that the fix is currently only available in the daily builds,
+not a released version.) Workaround: Remove the wget bundled inside the
+git-annex dmg.
+
 ## version 5.20140221
 
 The Windows port of the assistant and webapp is now considered to be beta

doc/devblog/day_149__signal.mdwn

@@ -1,3 +1,5 @@
+[[!meta title="day 150 signal"]]
+
 The git-remote-daemon now robustly handles loss of signal, with
 reconnection backoffs. And it detects if the remote ssh server has a too
 old version of git-annex-shell and the webapp will display a warning