Explorar el Código

Forward port patches/02_add_debian_files_in_manpage.

svn:r5819
Peter Palfrader hace 19 años
padre
commit
20bcce490a
Se han modificado 2 ficheros con 11 adiciones y 10 borrados
  1. 2 1
      debian/changelog
  2. 9 9
      debian/patches/02_add_debian_files_in_manpage.dpatch

+ 2 - 1
debian/changelog

@@ -1,8 +1,9 @@
 tor (0.1.1.12-alpha-1) experimental; urgency=low
 tor (0.1.1.12-alpha-1) experimental; urgency=low
 
 
   * New upstream version, that was a quick one. :)
   * New upstream version, that was a quick one. :)
+  * Forward port patches/02_add_debian_files_in_manpage.
 
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 11 Jan 2006 23:40:13 +0100
+ -- Peter Palfrader <weasel@debian.org>  Thu, 12 Jan 2006 02:53:27 +0100
 
 
 tor (0.1.1.11-alpha-1) experimental; urgency=low
 tor (0.1.1.11-alpha-1) experimental; urgency=low
 
 

+ 9 - 9
debian/patches/02_add_debian_files_in_manpage.dpatch

@@ -24,18 +24,18 @@ exit 0
 
 
 @DPATCH@
 @DPATCH@
 diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in
 diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in
---- tor-0.1.1.5/doc/tor.1.in
+--- tor-0.1.1.12/doc/tor.1.in
-+++ /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in
++++ /tmp/dpep.E9VjWB/tor-0.1.1.12/doc/tor.1.in
-@@ -627,6 +627,12 @@
+@@ -710,6 +710,12 @@
- .TP
+ (fingerprint) are rejected by the authoritative directory server. If
- .I @LOCALSTATEDIR@/lib/tor/
+ it is \fB!invalid\fP then descriptors are accepted but marked in the
- The tor process stores keys and other data here.
+ directory as not valid (not recommended).
 +.TP
 +.TP
-+.I /var/log/tor/
++.B /var/log/tor/
 +The tor server logs to this directory.
 +The tor server logs to this directory.
 +.TP
 +.TP
-+.I /var/run/tor/tor.pid
++.B /var/run/tor/tor.pid
 +The PID of the tor (master) process is stored in this file.
 +The PID of the tor (master) process is stored in this file.
- 
  .SH SEE ALSO
  .SH SEE ALSO
  .BR privoxy (1),
  .BR privoxy (1),
+ .BR tsocks (1),