Rev 4878: (vila) Release 2.1.4 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4878 [merge]
revision-id: pqm at pqm.ubuntu.com-20110516180433-fcvrfu4oex8baj4u
parent: pqm at pqm.ubuntu.com-20110415061837-3xup27i6ikx6wt9m
parent: v.ladeuil+lp at free.fr-20110516142558-ph2dcg1cpqzintyz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Mon 2011-05-16 18:04:33 +0000
message:
  (vila) Release 2.1.4 (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
=== modified file 'NEWS'
--- a/NEWS	2011-03-08 16:01:28 +0000
+++ b/NEWS	2011-05-16 14:25:58 +0000
@@ -8,7 +8,7 @@
 bzr 2.1.4
 #########
 
-:2.1.4: NOT RELEASED YET
+:2.1.4: 2011-05-16
 
 Compatibility Breaks
 ********************

=== modified file 'bzr'
--- a/bzr	2010-10-08 10:05:39 +0000
+++ b/bzr	2011-05-16 14:25:58 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2010-10-08 10:05:39 +0000
+++ b/bzrlib/__init__.py	2011-05-16 14:25:58 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@
 IGNORE_FILENAME = ".bzrignore"
 
 
-__copyright__ = "Copyright 2005-2010 Canonical Ltd."
+__copyright__ = "Copyright 2005-2011 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
@@ -44,7 +44,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, 1, 4, 'dev', 0)
+version_info = (2, 1, 4, 'final', 0)
 
 # API compatibility version: bzrlib is currently API compatible with 1.15.
 api_minimum_version = (2, 1, 0)