914897: Rephrase the ballot

[debian-ctte.git] / 914897_merged_usr / ballot.md

diff --git a/914897_merged_usr/ballot.md b/914897_merged_usr/ballot.md
index 86aaeb030486729bd8019b903bddda96d8e4c1fd..1f146fe079d797d1d18d9f194f24cd1a80e8a443 100644 (file)
--- a/914897_merged_usr/ballot.md
+++ b/914897_merged_usr/ballot.md
@@ -54,9 +54,10 @@ Two initiatives are worth mentioning at this point:
 
 Various valid long-term desireable situations coexist, and while discussing immediate countermeasures, it is useful to keep the long-term outcome that those are most likely to produce.
 
-These are the five possible situations at the time of bullseye (buster + 1):
+These are the six possible situations at the time of bullseye (buster + 1):
 
 * `none`: "merged `/usr`" has been reverted
+* `empty`: "merged `/usr`" has been reverted, `/usr` is empty (but the mandatory files)
 * `weak`: both directory schemes are allowed, packages only built on classical hosts
 * `middle`: both directory schemes are allowed, packages can be built anywhere
 * `hard`: both directory schemes are allowed, packages only built on "merged `/usr`" hosts
@@ -69,6 +70,7 @@ It can be summarized by the following table:
 | Codename | classical hosts | merged `/usr` hosts | symlinks allowed  | classical hosts | merged `/usr` hosts |   classical hosts   |  merged `/usr` hosts |
 |----------|-----------------|---------------------|-------------------|—----------------|---------------------|---------------------|----------------------|
 |     none |       yes       |          no         |         no        |       yes       |          no         |         yes         |          yes         |
+|    empty |       yes       |          no         |         no        |       yes       |          no         |         yes         |           no         |
 |     weak |       yes       |         yes         |        yes        |       yes       |          no         |          no         |          yes         |
 |   middle |       yes       |         yes         |        yes        |       yes       |         yes         |          no         |           no         |
 |     hard |       yes       |         yes         |        yes        |        no       |         yes         |          no         |           no         |
@@ -79,26 +81,14 @@ The current state of buster is `weak`.
 
 === DRAFT Resolution ===
 
-The Technical Committee resolves to:
+The Technical Committee resolves to decline to override the debootstrap maintainers.
 
-* Option A: Ask the debootstrap maintainers to disable "merged `/usr`" by default
-  (Using its §6.1.4 "Overrule a Developer" power; requires a 3:1 majority)
+Furthermore, using its §6.1.5 "Offering advice" power, the Technical Committee considers that:
 
-  Given that:
-  * hosts with both directory schemes already exist,
-  * the "merged `/usr`" directory scheme ought to be reserved for special use-cases,
-  * official packages ought to only be built on classical directory schemes,
+* A: The desireable solution at the time of bullseye is `weak`; both directory schemes should be allowed, but packages should only be built on hosts with classical directory schemes (or chroots).
 
-  … the Technical Committee considers that the desireable solution at the time of bullseye is `weak`; and asks the debootstrap maintainers to disable "merged `/usr`" by default.
+* B: The desireable solution at the time of bullseye is `hard`; both directory schemes should be allowed, and packages can be built on hosts with either classical or "merged-`/usr`" directory schemes.
 
-* Option B: Decline to override the debootstrap maintainers; offer advice
-  (Using its §6.1.5 "Offering advice" power)
-
-  Given that:
-  * hosts with both directory schemes already exist,
-  * it seems unpractical to allow official packages to be built on either directory schemes,
-  * there's inherent value in the simplicity of "merged `/usr`" directory schemes,
-  
-  … the Technical Committee considers that the desireable solution at the time of bullseye is `hard`; and declines to override the debootstrap maintainers.
+* FD: Further Discussion
 
 === End DRAFT Resolution ===