summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/patches/02_add_debian_files_in_manpage.dpatch18
2 files changed, 11 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog
index d60e29e183..66f7d6515b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
tor (0.1.1.12-alpha-1) experimental; urgency=low
* 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
diff --git a/debian/patches/02_add_debian_files_in_manpage.dpatch b/debian/patches/02_add_debian_files_in_manpage.dpatch
index 933ef311ca..277a2fb584 100755
--- a/debian/patches/02_add_debian_files_in_manpage.dpatch
+++ b/debian/patches/02_add_debian_files_in_manpage.dpatch
@@ -24,18 +24,18 @@ exit 0
@DPATCH@
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
-+++ /tmp/dpep.E9VjWB/tor-0.1.1.5/doc/tor.1.in
-@@ -627,6 +627,12 @@
- .TP
- .I @LOCALSTATEDIR@/lib/tor/
- The tor process stores keys and other data here.
+--- tor-0.1.1.12/doc/tor.1.in
++++ /tmp/dpep.E9VjWB/tor-0.1.1.12/doc/tor.1.in
+@@ -710,6 +710,12 @@
+ (fingerprint) are rejected by the authoritative directory server. If
+ it is \fB!invalid\fP then descriptors are accepted but marked in the
+ directory as not valid (not recommended).
+.TP
-+.I /var/log/tor/
++.B /var/log/tor/
+The tor server logs to this directory.
+.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.
-
.SH SEE ALSO
.BR privoxy (1),
+ .BR tsocks (1),