diff options
| author | Peter Palfrader <peter@palfrader.org> | 2005-12-11 15:44:59 +0000 |
|---|---|---|
| committer | Peter Palfrader <peter@palfrader.org> | 2005-12-11 15:44:59 +0000 |
| commit | 60f62473562c280480405cdb22f991db7c759480 (patch) | |
| tree | 3144aac596ec61107419001025b681469f144387 /debian | |
| parent | 5331ebd99de37780d4fc4b7272bf8faaae0e3f04 (diff) | |
| download | tor-60f62473562c280480405cdb22f991db7c759480.tar.gz tor-60f62473562c280480405cdb22f991db7c759480.zip | |
And make the debian package build with CVS again
svn:r5572
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | debian/patches/07_log_to_file_by_default.dpatch | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index be49e27ce2..a505af2ecf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tor (0.1.1.10-alpha-cvs-1) experimental; urgency=low + + * CVS snapshot + * forward port patches/07_log_to_file_by_default. + + -- Peter Palfrader <weasel@debian.org> Sun, 11 Dec 2005 14:06:03 +0100 + tor (0.1.1.10-alpha-1) experimental; urgency=low * New upstream version. diff --git a/debian/patches/07_log_to_file_by_default.dpatch b/debian/patches/07_log_to_file_by_default.dpatch index e0c5e4a346..e910f5ebc0 100755 --- a/debian/patches/07_log_to_file_by_default.dpatch +++ b/debian/patches/07_log_to_file_by_default.dpatch @@ -28,8 +28,8 @@ diff -urNad tor-0.1.1.5/src/or/config.c /tmp/dpep.YwfNhI/tor-0.1.1.5/src/or/conf +++ /tmp/dpep.YwfNhI/tor-0.1.1.5/src/or/config.c @@ -1548,7 +1548,7 @@ - /* Special case if no options are given. */ - if (!options->Logs) { + /* Special case on first boot if no Log options are given. */ + if (!old_options && !options->Logs) { - config_line_append(&options->Logs, "Log", "notice stdout"); + config_line_append(&options->Logs, "Log", "notice file /var/log/tor/log"); } |