Rev 3424: Update version in 'bzr' and 'bzrlib/__init__.py' in http://bzr.arbash-meinel.com/branches/bzr/jam-integration

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3424
revision-id: john at arbash-meinel.com-20080510113332-ax3i85t7hhbuorje
parent: john at arbash-meinel.com-20080510031356-keo9r2fv4gtr1uek
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Sat 2008-05-10 06:33:32 -0500
message:
  Update version in 'bzr' and 'bzrlib/__init__.py'
modified:
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
-------------- next part --------------
=== modified file 'bzr'
--- a/bzr	2008-05-02 05:43:54 +0000
+++ b/bzr	2008-05-10 11:33:32 +0000
@@ -22,7 +22,7 @@
 import sys
 
 # update this on each release
-_script_version = (1, 5, 0)
+_script_version = (1, 6, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-05-09 20:21:05 +0000
+++ b/bzrlib/__init__.py	2008-05-10 11:33:32 +0000
@@ -41,7 +41,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 = (1, 5, 0, 'candidate', 1)
+version_info = (1, 6, 0, 'dev', 0)
 
 
 # API compatibility version: bzrlib is currently API compatible with 0.18.

=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py	2008-05-02 07:31:24 +0000
+++ b/bzrlib/symbol_versioning.py	2008-05-10 11:33:32 +0000
@@ -50,6 +50,7 @@
            'one_three',
            'one_four',
            'one_five',
+           'one_six',
            ]
 
 from warnings import warn
@@ -80,6 +81,7 @@
 one_three = "%s was deprecated in version 1.3."
 one_four = "%s was deprecated in version 1.4."
 one_five = "%s was deprecated in version 1.5."
+one_six = "%s was deprecated in version 1.6."
 
 
 def deprecated_in(version_tuple):