From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 10 Nov 2008 15:52:53 +0000 (+0000)
Subject: No longer set now obsolete Group setting in built-in debian config
X-Git-Tag: tor-0.2.1.8-alpha~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90e832a5dbb5297e7a77c5e2c0a0c047a160eb0f;p=thirdparty%2Ftor.git

No longer set now obsolete Group setting in built-in debian config

svn:r17237
---

diff --git a/debian/changelog b/debian/changelog
index dfb84b902b..3595947a6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tor (0.2.1.7-alpha-2) experimental; urgency=low
+
+  * No longer set now obsolete Group setting in built-in debian config.
+
+ -- Peter Palfrader <weasel@debian.org>  Mon, 10 Nov 2008 16:28:31 +0100
+
 tor (0.2.1.7-alpha-1) experimental; urgency=low
 
   * New alpha release.
diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch
index 26695b7286..e893ddd508 100755
--- a/debian/patches/06_add_compile_time_defaults.dpatch
+++ b/debian/patches/06_add_compile_time_defaults.dpatch
@@ -53,7 +53,7 @@ diff -urNad git-trunk-conf~/src/or/config.c git-trunk-conf/src/or/config.c
    if (argv) { /* first time we're called. save commandline args */
      backup_argv = argv;
      backup_argc = argc;
-@@ -5051,3 +5057,64 @@
+@@ -5051,3 +5057,60 @@
    puts(routerparse_c_id);
  }
  
@@ -112,9 +112,5 @@ diff -urNad git-trunk-conf~/src/or/config.c git-trunk-conf/src/or/config.c
 +  tor_assert(var);
 +  var->initvalue = tor_strdup("debian-tor");
 +
-+  var = config_find_option(&options_format, "Group");
-+  tor_assert(var);
-+  var->initvalue = tor_strdup("debian-tor");
-+
 +  return 0;
 +}