Merge lp:~mbp/bzr/doc into lp:bzr

[Martin Pool]

Add a brief explanation/reminder to do SRUs after we do a stable-series release.

Just a brief explanation/reminder to do SRUs after we do a stable-series release.

[Vincent Ladeuil (vila)]

+1

May be worth adding your IRC answer there:

<poolie> for 2.0 it would be karmic
<poolie> 2.1 lucid
<poolie> 2.2 maverick

review: Approve

[lp:~mbp/bzr/doc]

5431. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-17

(spiv) Merge lp:bzr/2.2, including fixes for #625574, #636930,
 #254278.

5432. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-17

(gz) Display the correct test count at the start when selftest is run in
 verbose mode (Martin [gz])

5433. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(spiv) Suppress "maximum recursion depth exceeded in __subclasscheck__"
 warnings during selftest. (Andrew Bennetts)

5434. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(spiv) Improve help for 'bzr update', fix typo in help for 'bzr join',
 add docstrings in lsprof.py. (John C Barstow) (Andrew Bennetts)

5435. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(vila) Re-open bzr.dev for dev as 2.3.0dev2 (Vincent Ladeuil)

5436. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-20

(vila) Tweak tools/check-newsbug.py and do some light editing in
 doc/developers/ppa.txt. (Vincent Ladeuil)

[Andrew Bennetts (spiv)]

sent to pqm by email

[lp:~mbp/bzr/doc]

5437. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-21

(spiv) Add a brief explanation/reminder to do SRUs after we do a
 stable-series release. (Martin Pool)

=== modified file 'doc/developers/releasing.txt'
--- doc/developers/releasing.txt	2010-08-17 06:45:33 +0000
+++ doc/developers/releasing.txt	2010-09-17 08:15:57 +0000
@@ -378,6 +378,31 @@
 documented. If the instructions aren't clear enough, please fix them.
 
 
+Getting the release into Ubuntu
+-------------------------------
+
+(Feel free to propose or add new sections here about what we should do to
+get bzr into other places.)
+
+For the currently-under-development release of Ubuntu, no special action
+is needed: the release should be picked by Debian and synced from there into
+Ubuntu.
+
+Releases off stable bzr branches should go in to the ``-updates`` of the
+Ubuntu release that originally contained that branch.  (Ubuntu Lucid had
+bzr 2.2.0, so should get every 2.2.x update.)  This means going through
+the `SRU (Stable Release Updates)
+<https://wiki.ubuntu.com/StableReleaseUpdates>`__ process.   
+
+As of September 2010, bzr has applied to the technical board to be added
+to the `MicroReleaseExceptions
+<https://wiki.ubuntu.com/StableReleaseUpdates/MicroReleaseExceptions>`__
+category so that whole bugfix releases can more easily be approved.
+
+**After making a bzr stable-release release, nominate the most serious bug
+for the appropriate Ubuntu release and subscribe the `ubuntu-sru` team.**
+
+
 See also
 --------