[or-cvs] r9751: Merge 9746 into 0.1.2.x branch (tor/branches/tor-0_1_2-patches/debian)

[weasel@xxxxxxxx]

Author: weasel
Date: 2007-03-06 15:55:10 -0500 (Tue, 06 Mar 2007)
New Revision: 9751

Modified:
   tor/branches/tor-0_1_2-patches/debian/changelog
   tor/branches/tor-0_1_2-patches/debian/control
Log:
Merge 9746 into 0.1.2.x branch

Modified: tor/branches/tor-0_1_2-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_1_2-patches/debian/changelog	2007-03-06 20:28:10 UTC (rev 9750)
+++ tor/branches/tor-0_1_2-patches/debian/changelog	2007-03-06 20:55:10 UTC (rev 9751)
@@ -1,3 +1,9 @@
+tor (0.1.2.8-beta-1) XX; urgency=low
+
+  * Change recommends on privoxy to privoxy || polipo (>= 1) (closes: #413728).
+
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Tue,  6 Mar 2007 21:00:41 +0100
+
 tor (0.1.2.8-beta-1) experimental; urgency=low
 
   *  upstream version.

Modified: tor/branches/tor-0_1_2-patches/debian/control
===================================================================
--- tor/branches/tor-0_1_2-patches/debian/control	2007-03-06 20:28:10 UTC (rev 9750)
+++ tor/branches/tor-0_1_2-patches/debian/control	2007-03-06 20:55:10 UTC (rev 9751)
@@ -8,7 +8,7 @@
 Package: tor
 Architecture: any
 Depends: ${shlibs:Depends}, adduser, tsocks
-Recommends: privoxy, socat
+Recommends: privoxy || polipo (>= 1), socat
 Suggests: mixmaster, mixminion, anon-proxy
 Description: anonymizing overlay network for TCP
  Tor is a connection-based low-latency anonymous communication system which