Commit 9921ce7c authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Make sure all patches apply cleanly 


svn:r2776
parent 96723568

debian/changelog

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ tor (0.0.8+0.0.9pre5-1) unstable; urgency=low 


  * New upstream (pre)release.

  * 04_fix_test can be backed out again.

  * Make sure all patches apply cleanly.



 -- Peter Palfrader <weasel@debian.org>  Wed, 10 Nov 2004 03:26:40 +0100

debian/patches/01_uncomment_datadirectory.dpatch

+8 −8
Original line number Diff line number Diff line
@@ -23,15 +23,15 @@ esac 
exit 0



@DPATCH@

diff -urNad /home/weasel/projects/tor/cvs/src/config/torrc.sample.in cvs/src/config/torrc.sample.in

--- /home/weasel/projects/tor/cvs/src/config/torrc.sample.in	2004-03-01 23:41:26.000000000 +0100

+++ cvs/src/config/torrc.sample.in	2004-03-03 13:47:25.000000000 +0100

@@ -11,7 +11,7 @@

 ##################### Below is just for servers #####################

diff -urNad tor-0.0.9pre5/src/config/torrc.sample.in /tmp/dpep.bt2Xog/tor-0.0.9pre5/src/config/torrc.sample.in

--- tor-0.0.9pre5/src/config/torrc.sample.in	2004-11-09 21:04:18.000000000 +0100

+++ /tmp/dpep.bt2Xog/tor-0.0.9pre5/src/config/torrc.sample.in	2004-11-10 03:23:26.072988347 +0100

@@ -45,7 +45,7 @@

 

 ## The directory for keeping all the keys/etc for this server

 # The directory for keeping all the keys/etc. By default, we store

 # things in $HOME/.tor on Unix, and in Application Data\tor on Windows.

-#DataDirectory @LOCALSTATEDIR@/lib/tor

+DataDirectory @LOCALSTATEDIR@/lib/tor

 

 #Nickname moria # A unique handle for this server

 #Address moria.seul.org # The fqdn for this server
 
 ##################### Below is just for servers #####################

debian/patches/02_add_debian_files_in_manpage.dpatch

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ esac 
exit 0



@DPATCH@

diff -urNad /home/weasel/tmp/tor/tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in

--- /home/weasel/tmp/tor/tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in	2004-08-08 07:32:55.000000000 +0200

+++ tor-0.0.7.2+0.0.8pre3cvs/doc/tor.1.in	2004-08-08 15:16:27.185115824 +0200

@@ -201,6 +201,12 @@

diff -urNad tor-0.0.9pre5/doc/tor.1.in /tmp/dpep.E9VjWB/tor-0.0.9pre5/doc/tor.1.in

--- tor-0.0.9pre5/doc/tor.1.in	2004-11-10 02:20:59.000000000 +0100

+++ /tmp/dpep.E9VjWB/tor-0.0.9pre5/doc/tor.1.in	2004-11-10 03:24:17.697639909 +0100

@@ -333,6 +333,12 @@

 .TP

 .I @LOCALSTATEDIR@/lib/tor/

 The tor process stores keys and other data here.

debian/patches/03_tor_manpage_in_section_8.dpatch

+9 −9
Original line number Diff line number Diff line
@@ -23,23 +23,23 @@ esac 
exit 0



@DPATCH@

diff -urNad /home/weasel/projects/tor/cvs/contrib/torify.1 cvs/contrib/torify.1

--- /home/weasel/projects/tor/cvs/contrib/torify.1	2004-02-17 01:45:25.000000000 +0100

+++ cvs/contrib/torify.1	2004-05-07 01:12:57.000000000 +0200

diff -urNad tor-0.0.9pre5/contrib/torify.1 /tmp/dpep.fOA3Mm/tor-0.0.9pre5/contrib/torify.1

--- tor-0.0.9pre5/contrib/torify.1	2004-11-10 03:27:09.608843380 +0100

+++ /tmp/dpep.fOA3Mm/tor-0.0.9pre5/contrib/torify.1	2004-11-10 03:28:29.621248723 +0100

@@ -18,6 +18,6 @@

 binaries.

 to suid binaries.

 

 .SH SEE ALSO

-.BR tor (1),

+.BR tor (8),

 .BR tsocks (1),

 .BR tsocks.conf (5).

diff -urNad /home/weasel/projects/tor/cvs/doc/tor.1.in cvs/doc/tor.1.in

--- /home/weasel/projects/tor/cvs/doc/tor.1.in	2004-04-18 20:40:42.000000000 +0200

+++ cvs/doc/tor.1.in	2004-05-07 01:12:12.000000000 +0200

diff -urNad tor-0.0.9pre5/doc/tor.1.in /tmp/dpep.fOA3Mm/tor-0.0.9pre5/doc/tor.1.in

--- tor-0.0.9pre5/doc/tor.1.in	2004-11-10 03:28:29.263327434 +0100

+++ /tmp/dpep.fOA3Mm/tor-0.0.9pre5/doc/tor.1.in	2004-11-10 03:28:29.622248503 +0100

@@ -1,4 +1,4 @@

-.TH TOR 1 "November 2003" "TOR"

+.TH TOR 8 "November 2003" "TOR"

-.TH TOR 1 "November 2004" "TOR"

+.TH TOR 8 "November 2004" "TOR"

 .SH NAME

 tor \- The second-generation onion router

 .SH SYNOPSIS