Imported Upstream version 1.5.10upstream/1.5.10

1 files changed, 10 insertions, 7 deletions

diff --git a/HACKING b/HACKING
index e776fd6d..805fd2e0 100644
--- a/HACKING
+++ b/HACKING
@@ -208,16 +208,19 @@ To make a release of D-Bus, do the following:
  - post to dbus@lists.freedesktop.org announcing the release.
  
 
-After making a ".0" stable release
+Making a ".0" stable release
 ===
 
-We create a branch for each stable release; sometimes the branch is
-not done immediately, instead it's possible to wait until someone has
-a not-suitable-for-stable change they want to make and then branch to
-allow committing that change.
+We create a branch for each stable release. The branch name should be
+dbus-X.Y which is a branch that has releases versioned X.Y.Z;
+changes on a stable branch should be limited to significant bug fixes.
 
-The branch name should be dbus-X.Y which is a branch that has
-releases versioned X.Y.Z
+Because we won't make minor changes like keeping up with the latest
+deprecations on a stable branch, stable branches should turn off the
+gcc warning for deprecated declarations (e.g. see commit 4ebb275ab7).
+
+Be extra-careful not to merge master (or any branch based on master) into a
+stable branch.
 
 To branch:
   git branch dbus-X.Y