Hi Kurt,

sorry for answering so late, but I had a "great" combination of being
sick and too much work.

* Kurt Roeckx (k...@roeckx.be) [150921 08:34]:
> I would also really like to see such text replaced by a diff since
> it's for more obvious what the changes really are.

I think I said in 20150901173234.gh9...@mails.so.argh.org that the
diff in
http://anonscm.debian.org/cgit/users/odyx/supermajority-GR.git/ is the
canonical form. This should also have - at least IMHO - have clarified
the effect of the GR.

I attached these as git diffs so that we have it on our mail archive.

Do we need anything else?


Andi
>From d59551510dd8330dec023e18ee13ee84dfef256f Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Thu, 27 Aug 2015 11:26:02 +0200
Subject: [PATCH] Renumber the first section A.1 to A.0

---
 constitution.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/constitution.txt b/constitution.txt
index 6204fbe..bb8535d 100644
--- a/constitution.txt
+++ b/constitution.txt
@@ -477,7 +477,7 @@ A. Standard Resolution Procedure
    These rules apply to communal decision-making by committees and
    plebiscites, where stated above.
 
-  A.1. Proposal
+  A.0. Proposal
 
    The formal procedure begins when a draft resolution is proposed and
    sponsored, as required.
-- 
1.5.6.5

>From 0480d88e4ec36350541339239255261e341865cd Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Thu, 27 Aug 2015 11:28:09 +0200
Subject: [PATCH] Delete most of A.6(3) (which implemented the supermajority by dropping options at an early stage).  Specifically:

- Move A.6(3)(1) (the definition of V(A,B)) to a new subparagraph
  A.6(3)(0) before A.6(3)(1).
- Remove the rest of A.6(3) entirely, leaving A.6(2) to be
  followed by A.6(4).
---
 constitution.txt |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/constitution.txt b/constitution.txt
index bb8535d..26ac4db 100644
--- a/constitution.txt
+++ b/constitution.txt
@@ -573,14 +573,8 @@ A. Standard Resolution Procedure
     2. If the ballot has a quorum requirement R any options other than the
        default option which do not receive at least R votes ranking that
        option above the default option are dropped from consideration.
-    3. Any (non-default) option which does not defeat the default option
-       by its required majority ratio is dropped from consideration.
-         1. Given two options A and B, V(A,B) is the number of voters who
-            prefer option A over option B.
-         2. An option A defeats the default option D by a majority ratio
-            N, if V(A,D) is strictly greater than N * V(D,A).
-         3. If a supermajority of S:1 is required for A, its majority
-            ratio is S; otherwise, its majority ratio is 1.
+    3. Given two options A and B, V(A,B) is the number of voters who
+       prefer option A over option B.
     4. From the list of undropped options, we generate a list of pairwise
        defeats.
          1. An option A defeats an option B, if V(A,B) is strictly greater
-- 
1.5.6.5

>From 06b7cbfc7cf1d983dabb3103c74b53e0bc0af095 Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Thu, 27 Aug 2015 11:30:20 +0200
Subject: [PATCH] In A.6(8) replace all occurrences of "winner" with "prospective winner".  Replace "wins" in "which of those options wins" with "is the prospective winner".

---
 constitution.txt |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/constitution.txt b/constitution.txt
index 26ac4db..7f7ff2f 100644
--- a/constitution.txt
+++ b/constitution.txt
@@ -596,10 +596,11 @@ A. Standard Resolution Procedure
             equal to V(B,Y) and V(X,A) is greater than V(Y,B).
          2. A weakest defeat is a defeat that has no other defeat weaker
             than it. There may be more than one such defeat.
-    8. If there are no defeats within the Schwartz set, then the winner is
-       chosen from the options in the Schwartz set. If there is only one
-       such option, it is the winner. If there are multiple options, the
-       elector with the casting vote chooses which of those options wins.
+    8. If there are no defeats within the Schwartz set, then the
+       prospective winner is chosen from the options in the Schwartz set.
+       If there is only one such option, it is the prospective winner. If
+       there are multiple options, the elector with the casting vote
+       chooses which of those options is the prospective winner.
 
    Note: Options which the voters rank above the default option are
    options they find acceptable. Options ranked below the default options
-- 
1.5.6.5

>From f0be6b410024fd288e26d865a2a04deeb83d29f1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Thu, 27 Aug 2015 11:31:33 +0200
Subject: [PATCH] In A.6(8) add a new sentence at the end:

+ If there is no elector with a casting vote, the default option
+ wins.
---
 constitution.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/constitution.txt b/constitution.txt
index 7f7ff2f..7c0067b 100644
--- a/constitution.txt
+++ b/constitution.txt
@@ -600,7 +600,8 @@ A. Standard Resolution Procedure
        prospective winner is chosen from the options in the Schwartz set.
        If there is only one such option, it is the prospective winner. If
        there are multiple options, the elector with the casting vote
-       chooses which of those options is the prospective winner.
+       chooses which of those options is the prospective winner. If there
+       is no elector with a casting vote, the default option wins.
 
    Note: Options which the voters rank above the default option are
    options they find acceptable. Options ranked below the default options
-- 
1.5.6.5

>From 79ddefcf40c81bc40e4538b69c44d20729d07d70 Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Thu, 27 Aug 2015 11:32:50 +0200
Subject: [PATCH] Add a new section A.6(9) after A.6(8):

     + 9. 1. If the prospective winner W has no majority requirement,
     +       or defeats the default option D by its majority
     +       requirement, the prospective winner is the actual winner.
     +    2. Otherwise, the motion has failed its supermajority with
     +       the consequences set out alongside the majority
     +       requirement (or, if unspecified, the default option
     +       wins).
     +    3. An option A defeats the default option D by a
     +       majority of N:M if M * V(A,D) is greater than or equal to
     +       N * V(D,A).
---
 constitution.txt |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/constitution.txt b/constitution.txt
index 7c0067b..3838fed 100644
--- a/constitution.txt
+++ b/constitution.txt
@@ -602,6 +602,16 @@ A. Standard Resolution Procedure
        there are multiple options, the elector with the casting vote
        chooses which of those options is the prospective winner. If there
        is no elector with a casting vote, the default option wins.
+    9. 1. If the prospective winner W has no majority requirement,
+          or defeats the default option D by its majority
+          requirement, the prospective winner is the actual winner.
+       2. Otherwise, the motion has failed its supermajority with
+          the consequences set out alongside the majority
+          requirement (or, if unspecified, the default option
+          wins).
+       3. An option A defeats the default option D by a
+          majority of N:M if M * V(A,D) is greater than or equal to
+          N * V(D,A).
 
    Note: Options which the voters rank above the default option are
    options they find acceptable. Options ranked below the default options
-- 
1.5.6.5

>From f2e162468963d113ff5df098b265f184d8221bf1 Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Thu, 27 Aug 2015 11:35:27 +0200
Subject: [PATCH] In  6.1(4) (Technical Commitee power to overrule a Developer) &  4.1(4) (Developers' use of TC powers by GR) (if another constitutional amendment has not abolished that supermajority requirement), in each case after the "N:M majority" add

     +   ; failing that, the prospective winning resolution text becomes
     +   a non-binding statement of opinion
---
 constitution.txt |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/constitution.txt b/constitution.txt
index 3838fed..5382edf 100644
--- a/constitution.txt
+++ b/constitution.txt
@@ -86,7 +86,9 @@
     3. Make or override any decision authorised by the powers of the
        Project Leader or a Delegate.
     4. Make or override any decision authorised by the powers of the
-       Technical Committee, provided they agree with a 2:1 majority.
+       Technical Committee, provided they agree with a 2:1 majority;
+       failing that, the prospective winning resolution text becomes a
+       non-binding statement of opinion.
     5. Issue, supersede and withdraw nontechnical policy documents and
        statements.
        These include documents describing the goals of the project, its
@@ -260,10 +262,11 @@
     4. Overrule a Developer (requires a 3:1 majority).
        The Technical Committee may ask a Developer to take a particular
        technical course of action even if the Developer does not wish to;
-       this requires a 3:1 majority. For example, the Committee may
-       determine that a complaint made by the submitter of a bug is
-       justified and that the submitter's proposed solution should be
-       implemented.
+       this requires a 3:1 majority; failing that, the prospective winning
+       resolution text becomes a non-binding statement of opinion. For
+       example, the Committee may determine that a complaint made by the
+       submitter of a bug is a justified and that the submitter's proposed
+       solution should be implemented.
     5. Offer advice.
        The Technical Committee may make formal announcements about its
        views on any matter. Individual members may of course make informal
-- 
1.5.6.5

>From d5b300a8b760db15152f47e8c878ee37bb9e3187 Mon Sep 17 00:00:00 2001
From: Didier Raboud <o...@debian.org>
Date: Thu, 27 Aug 2015 11:36:34 +0200
Subject: [PATCH] In A.3(2) delete as follows:

         2. The default option must not have any supermajority requirements.
     -       Options which do not have an explicit supermajority requirement
     -       have a 1:1 majority requirement.
---
 constitution.txt |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/constitution.txt b/constitution.txt
index 5382edf..4b9b499 100644
--- a/constitution.txt
+++ b/constitution.txt
@@ -534,8 +534,6 @@ A. Standard Resolution Procedure
        ballot that includes an option for the original resolution, each
        amendment, and the default option (where applicable).
     2. The default option must not have any supermajority requirements.
-       Options which do not have an explicit supermajority requirement
-       have a 1:1 majority requirement.
     3. The votes are counted according to the rules in A.6. The default
        option is "Further Discussion", unless specified otherwise.
     4. In cases of doubt the Project Secretary shall decide on matters of
-- 
1.5.6.5

Reply via email to