[or-cvs] [tor/maint-0.2.1] Forward port 06_add_compile_time_defaults

[nickm@xxxxxxxx (Nick Mathewson)]

Author: Peter Palfrader <peter@xxxxxxxxxxxxx>
Date: Sat, 20 Jun 2009 13:00:41 +0200
Subject: Forward port 06_add_compile_time_defaults
Commit: 6be66447e76fb6a52c0cc47346611c02fbe29a83

---
 debian/changelog                                   |    3 ++-
 debian/patches/06_add_compile_time_defaults.dpatch |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c83d1f8..6209170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ tor (0.2.1.16-rc-1) unreleased; urgency=low
     - Change dh_strip call from --dbg-package=tor
       to --dbg-package=tor-dbg.
     - Update versioned build time dependency on debhelper.
+  * Forward port 06_add_compile_time_defaults.
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Sat, 20 Jun 2009 12:59:29 +0200
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Sat, 20 Jun 2009 13:00:14 +0200
 
 tor (0.2.1.15-rc-1) experimental; urgency=low
 
diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch
index 7dfce2e..a2472d1 100755
--- a/debian/patches/06_add_compile_time_defaults.dpatch
+++ b/debian/patches/06_add_compile_time_defaults.dpatch
@@ -50,7 +50,7 @@ diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c
 +  if (debian_config_fix_defaults() < 0)
 +    goto err;
 +
-   if (argv) { /* first time we're called. save commandline args */
+   if (argv) { /* first time we're called. save command line args */
      backup_argv = argv;
      backup_argc = argc;
 @@ -5307,3 +5313,62 @@
-- 
1.5.6.5