Skip to content

Commit 08c8532

Browse files
authored
Merge pull request #288 from TheJJ/fix-native-backports-version
clarify native version SRU backport variants
2 parents 3631728 + 572989f commit 08c8532

File tree

1 file changed

+26
-14
lines changed

1 file changed

+26
-14
lines changed

docs/how-ubuntu-is-made/concepts/version-strings.md

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,14 @@ Only packages with no Ubuntu modifications or those with no-change updates
108108
(i.e., versions with `build` rather than `ubuntu` in the revision), are
109109
automatically synced.
110110

111+
When your is already in Debian (and preliminary in Ubuntu), you can indicate a version with `willsync` to be overwritten by any future Debian version.
112+
The suffix `willsync` > `ubuntu` (and `ubuntu` prevents syncing, see above), so the next Debian update will overwrite the Ubuntu delta automatically.
113+
114+
| When | Current Debian | Current Ubuntu | Next Debian | Ubuntu sync indication |
115+
|------------------------------------------------------|----------------|----------------|--------------------|------------------------|
116+
| Ubuntu has delta, Debian caught up | `2.0-1` | `2.0-1ubuntu1` | `2.0-2` or `2.1-1` | `2.0-1willsync1` |
117+
| No Ubuntu delta, but new change already is in Debian | `2.0-1` | `2.0-1` | `2.0-2` or `2.1-1` | `2.0-1willsync1` |
118+
111119
If these updates pass Ubuntu's automated testing, they do not require manual
112120
intervention. However, there are scenarios where the automation cannot handle
113121
the process.
@@ -339,16 +347,19 @@ Native in Debian:
339347

340348
Native in Ubuntu:
341349

342-
| Previous version | Devel upload | SRU upload |
343-
|--------------------------------|--------------------------------|-----------------------------------------|
344-
| `2.0ubuntu` | `2.1ubuntu` or `3.0ubuntu` | `2.0ubuntu0.1` |
345-
| `2.0ubuntu0` (old format) | `2.1ubuntu` or `3.0ubuntu` | `2.0ubuntu0.1` |
346-
| `2ubuntu` | `3ubuntu` | `2ubuntu0.1` |
347-
| `2ubuntu0` (old format) | `3ubuntu` (new format) | `2ubuntu0.1` |
348-
| `3.1.2ubuntu.build10` | `3.1.3ubuntu` | `3.1.2ubuntu0.1` |
349-
| `2ubuntu` in multiple releases | `3ubuntu` or `3ubuntu~26.04.1` | `2ubuntu~25.10.1` and `2ubuntu~25.04.1` |
350+
| Previous version | Devel upload | SRU upload |
351+
|--------------------------------|--------------------------------|--------------------------------------------------|
352+
| `2.0ubuntu` | `2.1ubuntu` or `3.0ubuntu` | patch: `2.0ubuntu0.1` |
353+
| `2.0ubuntu0` (old format) | `2.1ubuntu` or `3.0ubuntu` | patch: `2.0ubuntu0.1` |
354+
| `2ubuntu` | `3ubuntu` | patch: `2ubuntu0.1` |
355+
| `2ubuntu0` (old format) | `3ubuntu` (new format) | patch: `2ubuntu0.1` |
356+
| `3.1.2ubuntu.build10` | `3.1.3ubuntu` | patch: `3.1.2ubuntu0.1` |
357+
| | | full: `3.1.3ubuntu~25.04.1` |
358+
| `2ubuntu` in multiple releases | `3ubuntu` or `3ubuntu~26.04.1` | patch: `2ubuntu0.25.10.1` and `2ubuntu0.25.04.1` |
359+
| | | full: `3ubuntu~25.10.1` and `3ubuntu~25.04.1` |
350360

351361
```{note}
362+
Depending on just a "patch" backport or rather the "full release", the SRU version number should be the current version incremented, or the new release version number with `~` to order before, respectively.
352363
353364
The rule of multiple releases with the same version needing to also add a
354365
per-release `YY.MM` to differentiate and ensure upgradability can be applied here as
@@ -451,12 +462,13 @@ List of this and further related examples:
451462
The new version is again independent of the former version that was present in
452463
the target release. Here are examples targeting 22.04:
453464

454-
| Previous | New development | Upload for LTS |
455-
| ---------------- | --------------- | ---------------------- |
456-
| `2.0-2` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
457-
| `2.0-2ubuntu2` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
458-
| `2.0-2ubuntu2.1` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
459-
| `2.0-2build1` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
465+
| Previous | New development | Upload for LTS |
466+
|------------------|-----------------|------------------------------------------------------|
467+
| `2.0-2` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
468+
| `2.0-2ubuntu2` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
469+
| `2.0-2ubuntu2.1` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
470+
| `2.0-2build1` | `3.1-1ubuntu2` | `3.1-1ubuntu2~22.04.1` |
471+
| `2.0ubuntu` | `3.1ubuntu` | see {ref}`native packages <version-native-packages>` |
460472

461473
```{note}
462474
If in this case the package in the Ubuntu development release is a native

0 commit comments

Comments
 (0)