Forward port 06_add_compile_time_defaults

diff --git a/debian/changelog b/debian/changelog
index c83d1f8eabde2c3181c74b765ac0e0abcfcbc5d9..620917081bf547ef1c5b1552671f049c712eced9 100644 (file)
--- 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@debian.org>  Sat, 20 Jun 2009 12:59:29 +0200
+ -- Peter Palfrader <weasel@debian.org>  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 7dfce2ef23f6e1e8685bdc382380f87a622086e1..a2472d1db8a04d8f33fd6ae3d06904d190677ee9 100755 (executable)
--- 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 @@