Rev 5656: (vila) Release 2.3.4 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.3/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.3/

------------------------------------------------------------
revno: 5656 [merge]
revision-id: pqm at pqm.ubuntu.com-20110714171422-y4vml6z8na8dxjcp
parent: pqm at pqm.ubuntu.com-20110714131108-0oitiz2v9yzpp5sm
parent: v.ladeuil+lp at free.fr-20110714161841-f3jr3cpocf3l3101
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Thu 2011-07-14 17:14:22 +0000
message:
  (vila) Release 2.3.4 (Vincent Ladeuil)
modified:
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
  doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2011-05-17 15:14:38 +0000
+++ b/bzrlib/__init__.py	2011-07-14 16:18:41 +0000
@@ -52,7 +52,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (2, 3, 4, 'dev', 0)
+version_info = (2, 3, 4, 'final', 0)
 
 # API compatibility version
 api_minimum_version = (2, 3, 0)

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- a/doc/en/release-notes/bzr-2.3.txt	2011-07-14 13:11:08 +0000
+++ b/doc/en/release-notes/bzr-2.3.txt	2011-07-14 16:18:41 +0000
@@ -9,7 +9,12 @@
 #########
 
 :Codename: One and counting
-:2.3.4: NOT RELEASED YET
+:2.3.4: 2011-07-14
+
+This is a bugfix release. Upgrading is recommended for all users of earlier
+2.3 releases.
+
+This mainly fixes bug #786980 which blocked the SRU process for Ubuntu Natty.
 
 External Compatibility Breaks
 *****************************
@@ -48,7 +53,7 @@
 
 * Updated the "Using stacked branches" section of the user guide to
   describe committing to stacked branches and expanded its discussion of
-  pushing a stcked branch.  (Andrew Bennetts)
+  pushing a stacked branch.  (Andrew Bennetts)
 
 API Changes
 ***********

=== modified file 'doc/en/whats-new/whats-new-in-2.3.txt'
--- a/doc/en/whats-new/whats-new-in-2.3.txt	2011-05-13 12:51:29 +0000
+++ b/doc/en/whats-new/whats-new-in-2.3.txt	2011-07-14 16:18:41 +0000
@@ -25,6 +25,8 @@
 Bazaar 2.3.3 is a bugfix release including the fixes in 2.3.2 and
 fixing the test helpers deprecated by python-2.7.
 
+Bazaar 2.3.4 is a bugfix release.
+
 See the :doc:`../release-notes/index` for details.
 
 Bazaar 2.3 is fully compatible both locally and on the network with 2.0, 2.1,