[or-cvs] r17354: {tor} No longer set now obsolete Group setting in built-in debian (in tor/branches/tor-0_2_0-patches/debian: . patches)

[weasel at seul.org]

Author: weasel
Date: 2008-11-21 17:33:11 -0500 (Fri, 21 Nov 2008)
New Revision: 17354

Modified:
   tor/branches/tor-0_2_0-patches/debian/changelog
   tor/branches/tor-0_2_0-patches/debian/patches/06_add_compile_time_defaults.dpatch
Log:
No longer set now obsolete Group setting in built-in debian config

Modified: tor/branches/tor-0_2_0-patches/debian/changelog
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/changelog	2008-11-21 22:30:09 UTC (rev 17353)
+++ tor/branches/tor-0_2_0-patches/debian/changelog	2008-11-21 22:33:11 UTC (rev 17354)
@@ -1,10 +1,11 @@
-tor (0.2.0.31-2) unstable; urgency=low
+tor (0.2.0.32-1) unstable; urgency=low
 
   * New upstream version.
     - Properly drops privileges when being configured to do
       so (closes: #505178).
+  * No longer set now obsolete Group setting in built-in debian config.
 
- -- Peter Palfrader <weasel at debian.org>  Fri, 21 Nov 2008 23:28:29 +0100
+ -- Peter Palfrader <weasel at debian.org>  Fri, 21 Nov 2008 23:32:42 +0100
 
 tor (0.2.0.31-1) unstable; urgency=low
 

Modified: tor/branches/tor-0_2_0-patches/debian/patches/06_add_compile_time_defaults.dpatch
===================================================================
--- tor/branches/tor-0_2_0-patches/debian/patches/06_add_compile_time_defaults.dpatch	2008-11-21 22:30:09 UTC (rev 17353)
+++ tor/branches/tor-0_2_0-patches/debian/patches/06_add_compile_time_defaults.dpatch	2008-11-21 22:33:11 UTC (rev 17354)
@@ -72,7 +72,7 @@
    if (errmsg) {
      log(LOG_WARN,LD_CONFIG,"Failed to parse/validate config: %s", errmsg);
      tor_free(errmsg);
-@@ -5011,3 +5018,64 @@
+@@ -5011,3 +5018,60 @@
    puts(routerparse_c_id);
  }
  
@@ -131,9 +131,5 @@
 +  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;
 +}