bzr: updated to 2.6.0

3 files changed, 27 insertions, 9 deletions

diff --git a/bzr/.footprint b/bzr/.footprint
index 5fb6f6795..c9704438b 100644
--- a/bzr/.footprint
+++ b/bzr/.footprint
@@ -4,7 +4,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python2.7/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzr-2.5.1-py2.7.egg-info
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzr-2.6.0-py2.7.egg-info
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/__init__.pyc
@@ -46,6 +46,8 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/_static_tuple_c.so
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/_static_tuple_py.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/_static_tuple_py.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/_termcolor.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/_termcolor.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/add.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/add.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/annotate.py
@@ -62,6 +64,11 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/branch.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/branchbuilder.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/branchbuilder.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/branchfmt/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/branchfmt/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/branchfmt/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/branchfmt/fullhistory.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/branchfmt/fullhistory.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/breakin.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/breakin.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/btree_index.py
@@ -323,11 +330,22 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/changelog_me
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/changelog_merge/tests/__init__.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/changelog_merge/tests/test_changelog_merge.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/cmds.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/cmds.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/grep.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/grep.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/test_grep.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/grep/test_grep.pyc
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/__init__.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/account.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/account.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/cmds.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/cmds.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/lp_api.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/lp_api.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/plugins/launchpad/lp_api_lite.py
@@ -469,6 +487,8 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/message.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/packrepository.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/packrepository.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/ping.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/ping.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/protocol.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/protocol.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/smart/repository.py
@@ -625,6 +645,8 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_outside_wt.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_pack.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_pack.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_ping.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_ping.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_pull.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_pull.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/blackbox/test_push.py
@@ -760,8 +782,6 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/ftp_server/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/__init__.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_bound_sftp.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_bound_sftp.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_branch.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_branch.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_break_lock.py
@@ -800,8 +820,6 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_push.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_reconcile.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_reconcile.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_revision_history.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_revision_history.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_revision_id_to_dotted_revno.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_branch/test_revision_id_to_revno.py
@@ -908,8 +926,6 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_has_revisions.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_has_same_location.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_has_same_location.pyc
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_iter_reverse_revision_history.py
--rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_iter_reverse_revision_history.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_locking.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_locking.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_repository/test_pack.py
@@ -1014,6 +1030,8 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_get_root_id.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_get_symlink_target.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_get_symlink_target.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_ids.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_ids.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_inv.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_inv.pyc
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/bzrlib/tests/per_tree/test_is_executable.py
diff --git a/bzr/.md5sum b/bzr/.md5sum
index e86f648fa..60677eea1 100644
--- a/bzr/.md5sum
+++ b/bzr/.md5sum
@@ -1 +1 @@
-ac5079858364a046071000d5cdccb67b  bzr-2.5.1.tar.gz
+28c86653d0df10d202c6b842deb0ea35  bzr-2.6.0.tar.gz
diff --git a/bzr/Pkgfile b/bzr/Pkgfile
index 376d9ff59..53741b858 100644
--- a/bzr/Pkgfile
+++ b/bzr/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: python
 
 name=bzr
-version=2.5.1
+version=2.6.0
 release=1
 source=(http://launchpad.net/$name/${version%.*}/$version/+download/$name-$version.tar.gz)