[or-cvs] [tor/master] Change order of recommends from privoxy | polipo to polipo | privoxy.

[arma@xxxxxxxx]

Author: Peter Palfrader <peter@xxxxxxxxxxxxx>
Date: Sun, 15 Nov 2009 10:56:06 +0100
Subject: Change order of recommends from privoxy | polipo to polipo | privoxy.
Commit: b0430672ea7f86db47d9d21b50c1679a63ef7b95

---
 debian/changelog |    3 ++-
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5c5f4d..019191d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ tor (0.2.2.5-alpha-1) experimental; urgency=low
   * Therefore build-depend on libssl-dev >= 0.9.8k-6.  If we build against
     earlier versions we will not work once libssl gets upgraded to a version
     that disabled renegotiations.
+  * Change order of recommends from privoxy | polipo to polipo | privoxy.
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Sun, 15 Nov 2009 10:38:36 +0100
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Sun, 15 Nov 2009 10:55:46 +0100
 
 tor (0.2.2.4-alpha-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index c7d310d..6282f57 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Package: tor
 Architecture: any
 Depends: ${shlibs:Depends}, adduser, tsocks
 Conflicts: libssl0.9.8 (<< 0.9.8g-9)
-Recommends: privoxy | polipo (>= 1), socat, logrotate, tor-geoipdb
+Recommends: polipo (>= 1) | privoxy, socat, logrotate, tor-geoipdb
 Suggests: mixmaster, mixminion, anon-proxy
 Description: anonymizing overlay network for TCP
  Tor is a connection-based low-latency anonymous communication system which
-- 
1.5.6.5