This is the wdiff of my proposal against the previous version so that people can easily (maybe?) see what changed since the last published version.
diff --git a/debian/resolution-gr b/debian/resolution-gr
index 8fbff41..c3421c7 100644
--- a/debian/resolution-gr
+++ b/debian/resolution-gr
@@ -42,22 +42,26 @@ This constitutional change attempts to address those issues
by
It also corrects a technical flaw that left the outcome of the vote for
Technical Committee Chair undefined in the event of a tie, and clarifies
responsibilities should the Technical Committee put forward a General
Resolution under [-point 4.2.1.-]{+§4.2.1.+}
Effect of the General Resolution
================================
The Debian Developers, by way of General Resolution, amend the Debian
constitution under [-point 4.1.2-]{+§4.1.2+} as follows. This General
Resolution
requires a 3:1 majority.
{+Section 4.2.1+}
{+-------------+}
{+Replace "amendment" with "ballot option."+}
Section 4.2.4
-------------
Strike the sentence "The minimum discussion period is 2 weeks, but may be
varied by up to 1 week by the Project Leader." (A modified version of
this provision is added to [-section A-]{+§A+} below.) Add to the end of this
[-point:-]{+paragraph:+}
The default option is "None of the above."
@@ -78,18 +82,18 @@ Replace in its entirety with:
Section 5.2.7
-------------
Replace "section §A.6" with [-"section §A.5".-]{+"§A.5".+}
Section 6.1.7
-------------
Replace "section §A.6" with [-"section §A.5".-]{+"§A.5".+}
Add to the end of this [-point:-]{+section:+}
There is no casting vote. If there are multiple options with no
defeats in the Schwartz set at the end of [-A.5.8,-]{+§A.5.8,+} the winner
will
be randomly chosen from those options, via a mechanism chosen by the
Project Secretary.
Section 6.3
@@ -124,20 +128,20 @@ Replace 6.3.1 in its entirety with:
any changes and voting starts automatically. This vote cannot be
canceled.
6. If a vote is canceled under [-point 6.3.1.4-]{+§6.3.1.4+} later than
13 days after
the initial proposed resolution, the vote specified in [-point
6.3.1.5-]{+§6.3.1.5+}
instead starts 24 hours after the time of cancellation. During
that 24 hour period, no one may call for a [-vote.-]{+vote, but
Technical+}
{+ Committee members may make ballot changes under §6.3.1.2.+}
Add a new paragraph to the start of 6.3.2 following "Details regarding
voting":
Votes are decided by the vote counting mechanism described in
[-section-] §A.5. The voting period lasts for one week or until the
outcome is
no longer in doubt assuming no members change their votes,
whichever is shorter. Members may change their votes until the
voting period ends. There is a quorum of two. The Chair has a
casting vote. The default option is "None of the above".
Strike "The Chair has a casting vote." from the existing text and make the
@@ -145,13 +149,14 @@ remaining text a separate, second paragraph.
In 6.3.3, replace "amendments" with "ballot options."
Add, at the end of[-section-] 6.3, the following new [-point:-]{+section:+}
7. Proposing a general resolution.
When the Technical Committee proposes a general resolution or a
ballot option in a general resolution to the project under [-point-]
[- 4.2.1,-]{+§4.2.1,+}
it may delegate {+(via resolution or other means agreed on by the+}
{+ Technical Committee)+} the authority to withdraw, amend, or make
minor changes to the ballot option to one of its members. If it
does not do so, these decisions must be made by resolution of the
Technical Committee.
@@ -159,14 +164,12 @@ Add, at the end of section 6.3, the following new point:
Section A
---------
Replace [-A.0-]{+§A.0+} through [-A.4-]{+§A.5+} in their entirety with:
A.0. Proposal
1. The formal procedure begins when a draft resolution is proposed and
sponsored, as [-required. A draft resolution must include the text of-]
[- that resolution and a short single-line summary suitable for-]
[- labeling the ballot choice.-]{+specified in §4.2.1.+}
2. This draft resolution becomes a ballot option in an initial
two-option ballot, the other option being the default option, and
@@ -200,17 +203,16 @@ Replace A.0 through A.4 in their entirety with:
inconsistencies, or other changes which do not alter the meaning),
providing no Developer objects within 24 hours. In this case the
length of the discussion period is not changed. If a Developer does
object, the change must instead be made via amendment under [-point-]
[- A.1.3.-]{+§A.1.3.+}
6. The Project Leader may, at any point in the process, increase or
decrease the minimum and maximum discussion period by up to 1 week
from their original values in [-point A.1.1,-]{+§A.1.1,+} except that
they may not do
so in a way that causes the discussion period to end within 48
hours of when this change is made. The length of the discussion
period is then recalculated as if the new minimum and maximum
lengths had been in place during all previous ballot changes under
[-points A.1.1-]{+§A.1.1+} and [-A.1.4.-]{+§A.1.4.+}
7. The default option has no proposer or sponsors, and cannot be
amended or withdrawn.
@@ -241,42 +243,42 @@ Replace A.0 through A.4 in their entirety with:
1. After the discussion period has ended, the Project Secretary will
publish the ballot and call for a vote. The Project Secretary may
do this immediately following the end of the discussion period and
must do so within [-five-]{+seven+} days of the end of the discussion
period.
2. The Project Secretary determines the order of ballot [-options.
At-]{+options and+}
their [-discretion they-]{+summaries used for the ballot. The Project
Secretary+} may [-reword-]{+ask+}
the [-single-line summaries-]{+ballot option proposers to draft those
summaries, and may+}
{+ revise them+} for [-clarity.-]{+clarity at their discretion.+}
3. Minor changes to ballot options under [-point A.1.5-]{+§A.1.5+} may
[-not-]{+only+} be made [-after or within-]{+if at+}
{+ least+} 24 hours [-of the end of-]{+remain in+} the discussion
[-period unless-]{+period, or if+} the Project
Secretary agrees the change does not alter the meaning of the
ballot option and (if it would do so) warrants delaying the
vote. The Project Secretary will allow 24 hours for objections
after any such change before issuing the call for a vote.
4. No new ballot options may be proposed, no ballot options may be
amended, and no proposers or sponsors may withdraw [-within-]{+if less
than+} 24
hours [-of the end of-]{+remain in+} the discussion
[-period-]{+period,+} unless this action
successfully extends the discussion period under [-point
A.1.4-]{+§A.1.4+} by at least
24 additional hours.
5. Actions to preserve the existing ballot may be taken within {+the+}
{+ last+} 24 hours of the[-end of the-] discussion period, namely a
sponsor objecting
to an amendment under [-point A.1.3,-]{+§A.1.3,+} a Developer objecting
to a minor
change under [-point A.1.5,-]{+§A.1.5,+} stepping forward as the
proposer for an
existing ballot option whose original proposer has withdrawn it
under [-point A.2.1,-]{+§A.2.1,+} or sponsoring an existing ballot
option that has
fewer than the required number of sponsors because of the
withdrawal of a sponsor under [-point A.2.2.-]{+§A.2.2.+}
6. The Project Secretary may make an exception to [-point A.3.4-]{+§A.3.4+}
and accept
changes to the ballot after they are no longer allowed, provided
that this is done at least 24 hours prior to the issuance of a call
for a vote. All other requirements for making a change to the
ballot must still be met. This is expected to be rare and should
only be done if the Project Secretary believes it would be harmful
to the best interests of the project for the change to not be made.
A.4. Voting procedure
@@ -284,16 +286,14 @@ Replace A.0 through A.4 in their entirety with:
have a 1:1 majority requirement. The default option does not have
any supermajority requirements.
2. The votes are counted according to the rules in[-section-] §A.5.
3. In cases of doubt the Project Secretary shall decide on matters of
procedure.
[-Strike section A.5 in its entirety.-]Rename [-section A.6-]{+§A.6+} to
[-A.5.-]{+§A.5.+}
Replace the paragraph at the end of [-section A.6-]{+§A.6+} (now
[-A.5)-]{+§A.5)+} with:
When the vote counting mechanism of the Standard Resolution Procedure
is to be used, the text which refers to it must specify who has a
--
Russ Allbery (r...@debian.org) <https://www.eyrie.org/~eagle/>
signature.asc
Description: PGP signature
