summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-29 16:20:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-29 16:30:49 -0400
commitb76753933a16bc320bf9760ac9019c9e2b971ab8 (patch)
treee3d96a27e9678e15426a73022daf2cf2a69aa422
parent01bd353a0f1b49d073f232fd69f9dc6f49b76eff (diff)
finally sorted out the OSX gpg mess
-rw-r--r--debian/changelog2
-rw-r--r--doc/bugs/Error_creating_encrypted_cloud_repository:___34__internal_server_error__34__.mdwn4
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9fbeae0a7..60bb23186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ git-annex (4.20130921) UNRELEASED; urgency=low
* webapp: Fixed a bug where when a new remote is added, one file
may fail to sync to or from it due to the transferrer process not
yet knowing about the new remote.
+ * OSX: Bundled gpg upgraded, now compatible with config files
+ written by MacGPG.
-- Joey Hess <joeyh@debian.org> Sun, 22 Sep 2013 19:42:29 -0400
diff --git a/doc/bugs/Error_creating_encrypted_cloud_repository:___34__internal_server_error__34__.mdwn b/doc/bugs/Error_creating_encrypted_cloud_repository:___34__internal_server_error__34__.mdwn
index a96aeae20..a44ecc82e 100644
--- a/doc/bugs/Error_creating_encrypted_cloud_repository:___34__internal_server_error__34__.mdwn
+++ b/doc/bugs/Error_creating_encrypted_cloud_repository:___34__internal_server_error__34__.mdwn
@@ -22,3 +22,7 @@ The operating system is Mac OS X 10.8.4, and the version of git-annex is 4.20130
"""]]
[[!meta title="OSX bundled gpg does not work with gpg.conf created by MacGPG"]]
+
+> [[done]]; I have updated the gpg to version 1.4.14 which
+> manages to build with the missing features.
+> --[[Joey]]