[foundation-web] 2010/rules: We do not separate between new applications and renewals

[Tobias Mueller <tobiasmue src gnome org>]

commit 66bd8e27c5f2bc8cdffaffb596d584a3c0aca4c4
Author: Tobias Mueller <tobiasmue gnome org>
Date:   Mon May 3 00:53:28 2010 +0100

    2010/rules: We do not separate between new applications and renewals
    
    This was separate because it takes less time to renew a membership. But
    we asked the currently existing members already to renew their
    membership so we can decrease the complexity by getting rid of another
    deadline.

 foundation.gnome.org/elections/2010/mkical.py |    4 ++--
 foundation.gnome.org/elections/2010/rules.wml |    9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/foundation.gnome.org/elections/2010/mkical.py b/foundation.gnome.org/elections/2010/mkical.py
index f42d6d4..0ace108 100644
--- a/foundation.gnome.org/elections/2010/mkical.py
+++ b/foundation.gnome.org/elections/2010/mkical.py
@@ -15,7 +15,7 @@ import vobject
 #### Configure these variables
 CANDIDATES_OPENED_DATE    = (2010, 5,  2)
 APPLICATIONS_CLOSED_DATE  = (2010, 5, 14)
-RENEWALS_CLOSED_DATE      = (2010, 5, 21)
+RENEWALS_CLOSED_DATE      = (2010, 5, 21) # Not used, renewals are incorporated into applications
 CANDIDATES_CLOSED_DATE    = (2010, 5, 23)
 CANDIDATES_ANNOUNCED_DATE = (2010, 5, 26)
 VOTING_OPENED_DATE        = (2010, 5, 30)
@@ -265,7 +265,7 @@ if __name__ == "__main__":
         APPLICATIONS_CLOSED,
         CANDIDATES_CLOSED,
         CANDIDATES_ANNOUNCED,
-        RENEWALS_CLOSED,
+        #RENEWALS_CLOSED,
         VOTING_OPENED,
         VOTING_CLOSED,
         PRELIMINARY_RESULTS,
diff --git a/foundation.gnome.org/elections/2010/rules.wml b/foundation.gnome.org/elections/2010/rules.wml
index 52adfde..2b0b792 100644
--- a/foundation.gnome.org/elections/2010/rules.wml
+++ b/foundation.gnome.org/elections/2010/rules.wml
@@ -106,14 +106,19 @@
     <p><small>(all deadlines are 23:59 UTC)</small></p> 
     <ul>
       <li>
-        2010-05-14 (Friday): Last day to apply for membership (to be eligible
-        for these elections).
+        2010-05-14 (Friday): Last day to apply for membership, including 
+        renewal (to be eligible for these elections).
         <!-- FIXME: We should get rid of that, because we can not guarantee anybody to become a member in time, let alone become a member at all -->
       </li>
+      
+<!-- We do not do that in 2010, because it adds complexity      
       <li>
         2010-05-21 (Friday): Last day to apply for renewal of your 
         membership (to be eligible for these elections).
       </li>
+-->
+
+      
       <li>
         2010-05-23 (Sunday): Last day to announce candidacies, submit summary
         statements.