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

svn:r17237

diff --git a/debian/changelog b/debian/changelog
index dfb84b902bac30e30d466bada12cdade0b868555..3595947a6bd839fc111581d8ef79cd61ada0aa69 100644 (file)
--- 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 26695b7286c5d2b82efd5c75a7182ba1d23ea333..e893ddd508d481b7596b5af8c7bf9cf58bcad008 100755 (executable)
--- 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;
 +}