X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=HACKING;h=805fd2e00de22cfbef8f1ffdd73529abc60ac009;hb=7d9239c9c78cb6d0b9c282376fcf3cda1de23209;hp=7a5a792c71b8573fe623020b00ce8c897e624dee;hpb=20d2f1702fc602d70fc2ed7a016289679106098e;p=platform%2Fupstream%2Fdbus.git diff --git a/HACKING b/HACKING index 7a5a792..805fd2e 100644 --- a/HACKING +++ b/HACKING @@ -154,6 +154,10 @@ To make a release of D-Bus, do the following: - update the file NEWS based on the git history + - verify that the version number of dbus-specification.xml is + changed if it needs to be; if changes have been made, update the + release date in that file + - update the AUTHORS file with "make update-authors" if necessary - the version number should have major.minor.micro, even @@ -175,7 +179,8 @@ To make a release of D-Bus, do the following: - bump the version number up in configure.ac (so the micro version is odd), and commit it. Make sure you do this *after* tagging the previous release! The idea is that git has a newer version number - than anything released. + than anything released. Similarly, bump the version number of + dbus-specification.xml and set the release date to "(not finalized)". - merge the branch you've released to the chronologically-later branch (usually "master"). You'll probably have to fix a merge @@ -203,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. + +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). -The branch name should be dbus-X.Y which is a branch that has -releases versioned X.Y.Z +Be extra-careful not to merge master (or any branch based on master) into a +stable branch. To branch: git branch dbus-X.Y @@ -298,6 +306,20 @@ rules are: - if there's a live unresolved controversy about a change, don't commit it while the argument is still raging. + - at their discretion, members of the reviewer group may also commit + branches/patches under these conditions: + + - the branch does not add or change API, ABI or wire-protocol + + - the branch solves a known problem and is covered by the regression tests + + - there are no objections from the rest of the review group within + a week of the patches being attached to Bugzilla + + - the committer gets a positive review on Bugzilla from someone they + consider qualified to review the change (e.g. a colleague with D-Bus + experience; not necessarily a member of the reviewer group) + - regardless of reviews, to commit a patch: - make check must pass - the test suite must be extended to cover the new code @@ -326,5 +348,4 @@ John Palmieri Scott James Remnant Will Thompson Simon McVittie - - +David Zeuthen