Rev 4668: Apply Martin's update to create bzr-2.0.0 final in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/jam-integration

------------------------------------------------------------
revno: 4668
revision-id: john at arbash-meinel.com-20090924203252-ymktsu36xafy6b6n
parent: pqm at pqm.ubuntu.com-20090915134430-dhugimcksa2wicf6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2009-09-24 15:32:52 -0500
message:
  Apply Martin's update to create bzr-2.0.0 final
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-09-11 18:28:19 +0000
+++ b/NEWS	2009-09-24 20:32:52 +0000
@@ -3,8 +3,28 @@
 ####################
 
 
-bzr 2.0.0 (Not Released Yet)
-############################
+bzr 2.0.0
+#########
+
+:2.0.0: 2009-09-22
+:Codename: Instant Karma
+
+This release of Bazaar makes the 2a (previously 'brisbane-core') format
+the default when new branches or repositories are created.  This format is
+substantially smaller and faster for many operations.  Most of the work in
+this release focuses on bug fixes and stabilization, covering both 2a and
+previous formats.  (See the Upgrade Guide for information on migrating
+existing projects.)
+
+This release also improves the documentation content and presentation,
+including adding Windows HtmlHelp manuals.
+
+The Bazaar team decided that 2.0 will be a long-term supported release,
+with bugfix-only 2.0.x releases based on it, continuing for at least six
+months or until the following stable release.
+
+Changes from 2.0.0rc2 to final
+******************************
 
 * Officially branded as 2.0.0 rather than 2.0 to clarify between things
   that "want to happen on the 2.0.x stable series" versus things that want
@@ -115,14 +135,6 @@
 :Codename: no worries
 :2.0.0rc1: 2009-08-26
 
-This release of Bazaar makes 2a 'brisbane-core' format the
-default.  Most of the work in this release now focuses on bug
-fixes and stabilization, covering both 2a and previous formats.
-
-The Bazaar team decided that 2.0 will be a long-term supported
-release, with bugfix-only releases based on it, continuing for at
-least six months or until the following stable release.
-
 Compatibility Breaks
 ********************
 

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-09-11 18:25:45 +0000
+++ b/bzrlib/__init__.py	2009-09-24 20:32:52 +0000
@@ -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, 0, 'candidate', 2)
+version_info = (2, 0, 0, 'final', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (1, 17, 0)