From 1247bfeaa7356e766d3ea09fa50bd300650f78af Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 16 Apr 2011 19:13:05 -0400
Subject: [PATCH] gpg recommended

---
 configure.hs     |  1 +
 debian/changelog |  2 ++
 debian/control   |  2 +-
 doc/install.mdwn | 10 ++++------
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.hs b/configure.hs
index 4ab3052395..c81aa17e69 100644
--- a/configure.hs
+++ b/configure.hs
@@ -16,6 +16,7 @@ tests =
 	, TestCase "rsync" $ requireCmd "rsync" "rsync --version >/dev/null"
 	, TestCase "curl" $ testCmd "curl" "curl --version >/dev/null"
 	, TestCase "bup" $ testCmd "bup" "bup --version >/dev/null"
+	, TestCase "gpg" $ testCmd "gpg" "gpg --version >/dev/null"
 	, TestCase "unicode FilePath support" $ unicodeFilePath
 	] ++ shaTestCases [1, 256, 512, 224, 384]
 
diff --git a/debian/changelog b/debian/changelog
index 91c0c8f4b3..04a6896e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 git-annex (0.20110402) UNRELEASED; urgency=low
 
   * bup is now supported as a special type of remote.
+  * The data sent to special remotes (Amazon S3, bup, etc) can be encrypted
+    using GPG for privacy.
   * Use lowercase hash directories for locationlog files, to avoid
     some issues with git on OSX with the mixed-case directories.
     No migration is needed; the old mixed case hash directories are still
diff --git a/debian/control b/debian/control
index 15155b9b43..42c79c91d8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: git-annex
 Architecture: any
 Section: utils
 Depends: ${misc:Depends}, ${shlibs:Depends}, git | git-core, uuid, openssh-client, rsync
-Suggests: graphviz, bup
+Suggests: graphviz, bup, gnupg
 Description: manage files with git, without checking their contents into git
  git-annex allows managing files with git, without checking the file
  contents into git. While that may seem paradoxical, it is useful when
diff --git a/doc/install.mdwn b/doc/install.mdwn
index 70ab8e30b6..746352cb8a 100644
--- a/doc/install.mdwn
+++ b/doc/install.mdwn
@@ -13,19 +13,17 @@ To build and use git-annex, you will need:
 * MissingH: <http://github.com/jgoerzen/missingh/wiki>
 * pcre-light: <http://hackage.haskell.org/package/pcre-light>
 * utf8-string: <http://hackage.haskell.org/package/utf8-string>
+* TestPack <http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack>
+* QuickCheck 2 <http://hackage.haskell.org/package/QuickCheck>
 * hS3 <http://hackage.haskell.org/package/hS3> (optional, but recommended)
 * `uuid`: <http://www.ossp.org/pkg/lib/uuid/>
-  (or uuidgen from util-linux)
+  (or `uuidgen` from util-linux)
 * `xargs`: <http://savannah.gnu.org/projects/findutils/>
 * `rsync`: <http://rsync.samba.org/>
 * `curl` : <http://http://curl.haxx.se/> (optional, but recommended)
 * `sha1sum`: <ftp://ftp.gnu.org/gnu/coreutils/> (optional, but recommended)
+* `gpg`: <http://gnupg.org/> (optional; needed for encryption)
 * [Ikiwiki](http://ikiwiki.info) is needed to build the documentation,
   but that will be skipped if it is not installed.
 
 Then just [[download]] git-annex and run: `make; make install`
-
-Additionally, to run the test suite (via `make test`), you will need:
-
-* `TestPack` <http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack>
-* `QuickCheck` 2 <http://hackage.haskell.org/package/QuickCheck>