[or-cvs] r9755: Forward port r9754: It only is a single |, not two (tor/trunk/debian)

[weasel@xxxxxxxx]

Author: weasel
Date: 2007-03-07 04:21:24 -0500 (Wed, 07 Mar 2007)
New Revision: 9755

Modified:
   tor/trunk/debian/changelog
   tor/trunk/debian/control
Log:
Forward port r9754: It only is a single |, not two

Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog	2007-03-07 09:20:10 UTC (rev 9754)
+++ tor/trunk/debian/changelog	2007-03-07 09:21:24 UTC (rev 9755)
@@ -1,8 +1,8 @@
 tor (0.1.2.8-beta-1) XX; urgency=low
 
-  * Change recommends on privoxy to privoxy || polipo (>= 1) (closes: #413728).
+  * Change recommends on privoxy to privoxy | polipo (>= 1) (closes: #413728).
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Tue,  6 Mar 2007 21:00:41 +0100
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Wed,  7 Mar 2007 10:19:54 +0100
 
 tor (0.1.2.8-beta-1) experimental; urgency=low
 

Modified: tor/trunk/debian/control
===================================================================
--- tor/trunk/debian/control	2007-03-07 09:20:10 UTC (rev 9754)
+++ tor/trunk/debian/control	2007-03-07 09:21:24 UTC (rev 9755)
@@ -8,7 +8,7 @@
 Package: tor
 Architecture: any
 Depends: ${shlibs:Depends}, adduser, tsocks
-Recommends: privoxy || polipo (>= 1), 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