[or-cvs] Do not patch the default torrc to include settings we reall...

[Peter Palfrader]

Update of /home/or/cvsroot/debian
In directory moria.mit.edu:/tmp/cvs-serv30154

Modified Files:
	changelog tor.docs 
Added Files:
	README.Debian 
Log Message:
Do not patch the default torrc to include settings we really want.  Instead modify the compiled in default options.

--- NEW FILE: README.Debian ---
This is the Debian package for Tor, The Onion Router.

The following changes have been made to the Tor source to integrate it better
into Debian:

- RunAsDaemon is enabled by default.
- PidFile is set to /var/run/tor/tor.pid.  No default upstream.
- default logging goes to /var/log/tor/log instead of stdout.
- DataDirectory is set to /var/lib/tor by default.  No default upstream.


-- 
Peter Palfrader, Fri, 12 Nov 2004 18:08:54 +0100

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/debian/changelog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- changelog	12 Nov 2004 16:52:10 -0000	1.70
+++ changelog	12 Nov 2004 17:17:58 -0000	1.71
@@ -5,8 +5,17 @@
   * Make logs readable by the system administrators (group adm).
   * Point to /var/log/tor (the directory) instead of a single
     file (/var/log/tor/log) in the debian patch of the manpage.
+  * Do not patch the default torrc to include settings we really want.
+    Instead modify the compiled in default options.  Those settings are
+    
+    - RunAsDaemon is enabled by default.
+    - PidFile is set to /var/run/tor/tor.pid.  No default upstream.
+    - default logging goes to /var/log/tor/log instead of stdout.
+    - DataDirectory is set to /var/lib/tor by default.  No default upstream.
+    
+    This is also documented in the new debian/README.Debian.
 
- -- Peter Palfrader <weasel at debian.org>  Fri, 12 Nov 2004 17:51:13 +0100
+ -- Peter Palfrader <weasel at debian.org>  Fri, 12 Nov 2004 18:11:26 +0100
 
 tor (0.0.8+0.0.9pre5-1) unstable; urgency=low
 

Index: tor.docs
===================================================================
RCS file: /home/or/cvsroot/debian/tor.docs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tor.docs	6 Aug 2004 21:31:01 -0000	1.4
+++ tor.docs	12 Nov 2004 17:17:58 -0000	1.5
@@ -2,6 +2,7 @@
 README
 INSTALL
 debian/README.privoxy
+debian/README.Debian
 doc/CLIENTS
 doc/FAQ
 doc/HACKING