From e5ed920852f028885621a45a614a87aa3c842dce Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 18 Feb 2025 14:38:19 +0000 Subject: [PATCH] Document the change of development branch name to main Signed-off-by: Simon McVittie --- CONTRIBUTING.md | 14 ++++++++++++++ NEWS | 4 ++++ 2 files changed, 18 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5041308b..7155d49a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,6 +10,20 @@ Source code and issue tracking for the D-Bus specification and its reference implementation 'dbus' are provided by freedesktop.org Gitlab: . +## Default branch renamed to `main` + +The default development branch for dbus has been renamed to `main`. To +update your local checkout, use steps similar to: + +```sh +git checkout master +git branch -m master main +git fetch +git branch --unset-upstream +git branch --set-upstream-to=origin/main +git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main +``` + ## Reporting security vulnerabilities If you find a security vulnerability that is not known to the public, diff --git a/NEWS b/NEWS index c69885f1..5d20ed8c 100644 --- a/NEWS +++ b/NEWS @@ -15,6 +15,10 @@ Build system and dependencies: the compile-time DBUS_VERSION or the runtime dbus_get_version(). (dbus#530, dbus!494; Simon McVittie) +• The branch used for development releases has been renamed to `main`. + Please see CONTRIBUTING.md for details of how to update existing checkouts. + (dbus#530, Simon McVittie) + Bug fixes: • On Linux, fix build regression with libselinux ≥ 3.8 and verbose mode