Hello,
following the recent discussions of June and of the last days, I'm
proposing the changes below to DEP-14. Basically it replaces debian/master
with debian/latest for all the reasons already discussed earlier. And
it says that debian/unstable is preferred over debian/sid.
And it also marks the proposal as ACCEPTED given that it has gained
traction over the years and that we didn't feel the need to make
significant change to it.
I'm proposing debian/latest now because DEP-14 is already recommending
upstream/latest and that makes the result a bit more consistent. But if
enough person disagree with this choice, we can look into setting a poll
to choose among all the names proposed so far.
Let me know your thoughts:
diff --git a/web/deps/dep14.mdwn b/web/deps/dep14.mdwn
index 0316fe1..beb96ea 100644
--- a/web/deps/dep14.mdwn
+++ b/web/deps/dep14.mdwn
@@ -2,11 +2,11 @@
Title: Recommended layout for Git packaging repositories
DEP: 14
- State: DRAFT
- Date: 2016-11-09
- Drivers: Raphael Hertzog <hertzog@debian.org>
- URL: http://dep.debian.net/deps/dep14
- Source: http://anonscm.debian.org/viewvc/dep/web/deps/dep14.mdwn
+ State: ACCEPTED
+ Date: 2020-08-29
+ Drivers: Raphaël Hertzog <hertzog@debian.org>
+ URL: https://dep-team.pages.debian.net/deps/dep14/
+ Source: https://salsa.debian.org/dep-team/deps/-/blob/master/web/deps/dep14.mdwn
Abstract:
Recommended naming conventions in Git repositories used
to maintain Debian packages
@@ -92,24 +92,28 @@ For development releases
------------------------
Packages uploaded to the current development release should be prepared
-in a `<vendor>/master` branch.
+in a `<vendor>/latest` branch.
However, when multiple development releases are regularly used (for
example `unstable` and `experimental` in Debian), it is also accepted to
-name the branches according to the codename or the suite name of the
-target distribution (aka `debian/sid` or `debian/unstable`, and
-`debian/experimental`). Those branches can be short-lived (i.e. they exist
-only until they are merged into `<vendor>/master` or until the version in
-the associated repository is replaced by the version in `<vendor>/master`)
-or they can be permanent (in which case `<vendor>/master` should not
-exist).
+name the branches according to the suite name of the
+target distribution (aka `debian/unstable`, and `debian/experimental`).
+Those branches can be short-lived (i.e. they exist only until they are
+merged into `<vendor>/latest` or until the version in the associated
+repository is replaced by the version in `<vendor>/latest`) or they can be
+permanent (in which case `<vendor>/latest` should not exist).
+
+In the interest of homogeneity and of clarity, we recommend the use of
+`debian/unstable` over `debian/sid` as it better conveys its special nature
+as opposed to other branches named after codenames which are used for
+stable releases.
NOTE: If the Git repository listed in debian/control's `Vcs-Git` field does
not indicate an explicit branch (with the `-b <branch>` suffix) then it should
have its HEAD point to the branch where new upstream versions are being
packaged (that is one of the branches associated to a development release).
The helper tools that do create those repositories should use a command
-like `git symbolic-ref HEAD refs/heads/debian/master` to update HEAD
+like `git symbolic-ref HEAD refs/heads/debian/latest` to update HEAD
to point to the desired branch.
For stable releases
@@ -200,7 +204,7 @@ developers and the package maintainers are not the same set of persons.
When upstream is Debian (or one of its derivative), the upstream vendor
should not use the usual `<vendor>/` prefix (but all others vendors should
-do so). The main development branch can be named `master` instead of
+do so). The main development branch does not have to be named after
the codename of the target distribution (although you are free to still
use the codename if you wish so).
@@ -293,3 +297,6 @@ Changes
* 2014-11-05: Initial draft by Raphaël Hertzog.
* 2016-11-09: Extended version mangling to troublesome dots -- Ian Jackson.
+* 2020-08-29:
+ * Replace debian/master with debian/latest
+ * Recommend debian/unstable over debian/sid
--
⢀⣴⠾⠻⢶⣦⠀ Raphaël Hertzog <hertzog@debian.org>
⣾⠁⢠⠒⠀⣿⡁
⢿⡄⠘⠷⠚⠋ The Debian Handbook: https://debian-handbook.info/get/
⠈⠳⣄⠀⠀⠀⠀ Debian Long Term Support: https://deb.li/LTS
Attachment:
signature.asc
Description: PGP signature