@@ -52,12+52,13 @@ 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.
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
* `weak`: both directory schemes are allowed, packages only built on classical hosts
* `none`: "merged `/usr`" has been reverted
* `weak`: both directory schemes are allowed, packages only built on classical hosts
-* `hard`: both directory schemes are allowed, packages can be built anywhere
-* `all` : only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" 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
+* `all`: only "merged `/usr`" directory schemes are allowed, packages only built on "merged `/usr`" hosts
* `full`: only "merged `/usr`" directory schemes are allowed, symlinks have been removed
It can be summarized by the following table:
* `full`: only "merged `/usr`" directory schemes are allowed, symlinks have been removed
It can be summarized by the following table:
@@ -68,7+69,8 @@ It can be summarized by the following table: