Forward port 06_add_compile_time_defaults

This commit is contained in:
Peter Palfrader 2009-06-20 13:00:41 +02:00
parent ee2cdd1ddf
commit 6be66447e7
2 changed files with 3 additions and 2 deletions

3
debian/changelog vendored
View File

@ -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

View File

@ -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 @@