Rev 4741: (mbp) release 2.0.5 in file:///home/pqm/archives/thelove/bzr/2.0/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4741 [merge]
revision-id: pqm at pqm.ubuntu.com-20100323082840-6zsr0oeufode5g30
parent: pqm at pqm.ubuntu.com-20100317053740-vics0asi5dga6bxy
parent: mbp at canonical.com-20100323070102-stw3bv72jmbqo5pv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.0
timestamp: Tue 2010-03-23 08:28:40 +0000
message:
  (mbp) release 2.0.5
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2010-03-17 04:26:48 +0000
+++ b/NEWS	2010-03-23 06:55:16 +0000
@@ -8,8 +8,11 @@
 bzr 2.0.5
 #########
 
-:Codename:
-:2.0.5: NOT RELEASED YET
+:2.0.5: 2010-03-23
+
+This fifth release in our 2.0 series addresses several user-inconvenience
+bugs.  None are critical, but upgrading is recommended for all users on
+earlier 2.0 releases.
 
 Bug Fixes
 *********
@@ -38,9 +41,6 @@
 * Handle renames correctly when there are files or directories that 
   differ only in case.  (Chris Jones, Martin Pool, #368931)
 
-* Fixed CHM generation by moving the NEWS section template into
-  a separate file. (Ian Clatworthy, #524184)
-
 * If ``bzr push --create-prefix`` triggers an unexpected ``NoSuchFile``
   error, report that error rather than failing with an unhelpful
   ``UnboundLocalError``.
@@ -60,6 +60,10 @@
 * Added ``location-alias`` help topic.
   (Andrew Bennetts, #337834)
 
+* Fixed CHM generation by moving the NEWS section template into
+  a separate file. (Ian Clatworthy, #524184)
+
+
 bzr 2.0.4
 #########
 

=== modified file 'bzr'
--- a/bzr	2009-12-15 16:56:18 +0000
+++ b/bzr	2010-03-23 06:55:16 +0000
@@ -23,7 +23,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 0, 4)
+_script_version = (2, 0, 5)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-01-21 19:35:57 +0000
+++ b/bzrlib/__init__.py	2010-03-23 07:01:02 +0000
@@ -41,7 +41,7 @@
 user_encoding = get_user_encoding()
 
 
-__copyright__ = "Copyright 2005, 2006, 2007, 2008, 2009 Canonical Ltd."
+__copyright__ = "Copyright 2005-2010 Canonical Ltd."
 
 # same format as sys.version_info: "A tuple containing the five components of
 # the version number: major, minor, micro, releaselevel, and serial. All
@@ -50,7 +50,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, 0, 4, 'final', 0)
+version_info = (2, 0, 5, 'final', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (1, 17, 0)