From 4eb9dc7bc3c2ccde80f870f6958e88c29bd90805 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Thu, 12 Jan 2006 02:19:40 +0000 Subject: [PATCH] Forward port patches/02_add_debian_files_in_manpage and patches/03_tor_manpage_in_section_8. svn:r5822 --- debian/changelog | 10 +++++++++- .../02_add_debian_files_in_manpage.dpatch | 18 +++++++++++------- .../patches/03_tor_manpage_in_section_8.dpatch | 4 ++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 66f7d6515b..7432119d87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tor (0.1.1.12-alpha-2XXXXXX) unreleased; urgency=low + + * CVS SNAPSHOT + * Forward port patches/02_add_debian_files_in_manpage. + * Forward port patches/03_tor_manpage_in_section_8. + + -- Peter Palfrader Thu, 12 Jan 2006 03:18:59 +0100 + tor (0.1.1.12-alpha-1) experimental; urgency=low * New upstream version, that was a quick one. :) @@ -8,7 +16,7 @@ tor (0.1.1.12-alpha-1) experimental; urgency=low tor (0.1.1.11-alpha-1) experimental; urgency=low * New upstream version. - * forward port patches/07_log_to_file_by_default. + * Forward port patches/07_log_to_file_by_default. * Forward port 0.1.0.16 changelog and change to copyright file. -- Peter Palfrader Wed, 11 Jan 2006 12:08:25 +0100 diff --git a/debian/patches/02_add_debian_files_in_manpage.dpatch b/debian/patches/02_add_debian_files_in_manpage.dpatch index 277a2fb584..69f8c8a535 100755 --- a/debian/patches/02_add_debian_files_in_manpage.dpatch +++ b/debian/patches/02_add_debian_files_in_manpage.dpatch @@ -26,16 +26,20 @@ exit 0 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.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). +@@ -700,9 +700,15 @@ + .TP + .B @LOCALSTATEDIR@/lib/tor/ + The tor process stores keys and other data here. +.TP +.B /var/log/tor/ +The tor server logs to this directory. +.TP +.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), + .LP + .TP +-.B \fIDataDirectory\fP/approved-routers ++.B /var/lib/tor/approved-routers + Only for naming authoritative directory servers + (see \fBNamingAuthoritativeDirectory\fP). + This file lists nickname to identity bindings. Each line lists a diff --git a/debian/patches/03_tor_manpage_in_section_8.dpatch b/debian/patches/03_tor_manpage_in_section_8.dpatch index 75e342c189..fe8a399968 100755 --- a/debian/patches/03_tor_manpage_in_section_8.dpatch +++ b/debian/patches/03_tor_manpage_in_section_8.dpatch @@ -38,8 +38,8 @@ diff -urNad tor-0.1.1.5/doc/tor.1.in /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in --- tor-0.1.1.5/doc/tor.1.in +++ /tmp/dpep.fOA3Mm/tor-0.1.1.5/doc/tor.1.in @@ -1,4 +1,4 @@ --.TH TOR 1 "September 2005" "TOR" -+.TH TOR 8 "September 2005" "TOR" +-.TH TOR 1 "January 2006" "TOR" ++.TH TOR 8 "January 2006" "TOR" .SH NAME tor \- The second-generation onion router .SH SYNOPSIS