summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-01-27 08:48:16 +1100
committerGravatar Joey Hess <joey@kitenet.net>2013-01-27 08:48:16 +1100
commit29af01f0a1b9851a9ead5d2286b23c57969e187c (patch)
tree01ad2b2eb54ba6423c902aff84e16ebb059d5a5e
parente95cef8fcd72f50c1144e3bec9e00559c0a77df6 (diff)
depend on both wget and curl
wget is used due to having better progress output, but curl is used in some cases where wget is not appropriate.
-rw-r--r--debian/control3
-rw-r--r--doc/install/fromscratch.mdwn3
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 6bfe63da9..cf25d65df 100644
--- a/debian/control
+++ b/debian/control
@@ -63,7 +63,8 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
git (>= 1:1.7.7.6),
uuid,
rsync,
- wget | curl,
+ wget,
+ curl,
openssh-client (>= 1:5.6p1)
Recommends: lsof, gnupg, bind9-host
Suggests: graphviz, bup, libnss-mdns
diff --git a/doc/install/fromscratch.mdwn b/doc/install/fromscratch.mdwn
index a5c402c24..91a0d7f61 100644
--- a/doc/install/fromscratch.mdwn
+++ b/doc/install/fromscratch.mdwn
@@ -53,7 +53,8 @@ quite a lot.
(or `uuidgen` from util-linux)
* [xargs](http://savannah.gnu.org/projects/findutils/)
* [rsync](http://rsync.samba.org/)
- * [wget](http://www.gnu.org/software/wget/) or [curl](http://http://curl.haxx.se/) (optional, but recommended)
+ * [curl](http://http://curl.haxx.se/) (optional, but recommended)
+ * [wget](http://www.gnu.org/software/wget/) (optional)
* [sha1sum](ftp://ftp.gnu.org/gnu/coreutils/) (optional, but recommended;
a sha1 command will also do)
* [gpg](http://gnupg.org/) (optional; needed for encryption)