3 files changed, 166 insertions, 149 deletions

diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 8de9c07ea3bc..4adc49f0a307 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bzr-gtk
-PORTVERSION=	0.17.0
+PORTVERSION=	0.18.0
 CATEGORIES=	devel
 MASTER_SITES=	http://samba.org/~jelmer/bzr/
 
diff --git a/devel/bzr-gtk/distinfo b/devel/bzr-gtk/distinfo
index c3ee3b081c08..508752e1a9ef 100644
--- a/devel/bzr-gtk/distinfo
+++ b/devel/bzr-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (bzr-gtk-0.17.0.tar.gz) = 053425c9fa3f95e3d72330ec9c3fe5f4
-SHA256 (bzr-gtk-0.17.0.tar.gz) = 6e097ccebf237bd168eb4e54c146ec4af0de958ffacaafb48751d4d37cfdbf73
-SIZE (bzr-gtk-0.17.0.tar.gz) = 124389
+MD5 (bzr-gtk-0.18.0.tar.gz) = 4be297c58fc6aeb79e660d77770f24fd
+SHA256 (bzr-gtk-0.18.0.tar.gz) = 73ddfe68418a688f2a8f8ba533434a02356ab32e6338a20071420b163c9ab8ea
+SIZE (bzr-gtk-0.18.0.tar.gz) = 129174
diff --git a/devel/bzr-gtk/pkg-plist b/devel/bzr-gtk/pkg-plist
index 6b46aa2335c1..3cc005319d37 100644
--- a/devel/bzr-gtk/pkg-plist
+++ b/devel/bzr-gtk/pkg-plist
@@ -1,184 +1,198 @@
 @comment $FreeBSD$
 bin/olive-gtk
-%%PYTHON_SITELIBDIR%%/olive/__init__.py
-%%PYTHON_SITELIBDIR%%/olive/add.py
-%%PYTHON_SITELIBDIR%%/olive/bookmark.py
-%%PYTHON_SITELIBDIR%%/olive/guifiles.py
-%%PYTHON_SITELIBDIR%%/olive/info.py
-%%PYTHON_SITELIBDIR%%/olive/info_helper.py
-%%PYTHON_SITELIBDIR%%/olive/launch.py
-%%PYTHON_SITELIBDIR%%/olive/menu.py
-%%PYTHON_SITELIBDIR%%/olive/mkdir.py
-%%PYTHON_SITELIBDIR%%/olive/move.py
-%%PYTHON_SITELIBDIR%%/olive/remove.py
-%%PYTHON_SITELIBDIR%%/olive/rename.py
-%%PYTHON_SITELIBDIR%%/olive/__init__.pyc
-%%PYTHON_SITELIBDIR%%/olive/add.pyc
-%%PYTHON_SITELIBDIR%%/olive/bookmark.pyc
-%%PYTHON_SITELIBDIR%%/olive/guifiles.pyc
-%%PYTHON_SITELIBDIR%%/olive/info.pyc
-%%PYTHON_SITELIBDIR%%/olive/info_helper.pyc
-%%PYTHON_SITELIBDIR%%/olive/launch.pyc
-%%PYTHON_SITELIBDIR%%/olive/menu.pyc
-%%PYTHON_SITELIBDIR%%/olive/mkdir.pyc
-%%PYTHON_SITELIBDIR%%/olive/move.pyc
-%%PYTHON_SITELIBDIR%%/olive/remove.pyc
-%%PYTHON_SITELIBDIR%%/olive/rename.pyc
-%%PYTHON_SITELIBDIR%%/olive/__init__.pyo
-%%PYTHON_SITELIBDIR%%/olive/add.pyo
-%%PYTHON_SITELIBDIR%%/olive/bookmark.pyo
-%%PYTHON_SITELIBDIR%%/olive/guifiles.pyo
-%%PYTHON_SITELIBDIR%%/olive/info.pyo
-%%PYTHON_SITELIBDIR%%/olive/info_helper.pyo
-%%PYTHON_SITELIBDIR%%/olive/launch.pyo
-%%PYTHON_SITELIBDIR%%/olive/menu.pyo
-%%PYTHON_SITELIBDIR%%/olive/mkdir.pyo
-%%PYTHON_SITELIBDIR%%/olive/move.pyo
-%%PYTHON_SITELIBDIR%%/olive/remove.pyo
-%%PYTHON_SITELIBDIR%%/olive/rename.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/about.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/about.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/about.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/logview.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tortoise-bzr.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/initialize.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/initialize.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/initialize.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graph.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graphcell.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graph.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graphcell.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graph.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graphcell.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_preferences.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_tortoise_bzr.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_viz.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_preferences.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_tortoise_bzr.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_viz.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_preferences.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_tortoise_bzr.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_viz.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/colormap.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/config.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/gannotate.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/annotate/spanselector.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/logview.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/logview.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/logview.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/notify.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/notify.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/notify.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/__init__.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/add.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/bookmark.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/guifiles.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info_helper.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/launch.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/menu.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/mkdir.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/move.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/remove.py
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/rename.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/add.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/bookmark.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/guifiles.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info_helper.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/launch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/menu.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/mkdir.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/move.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/remove.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/rename.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/add.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/add.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/add.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/bookmark.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/bookmark.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/bookmark.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/guifiles.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/guifiles.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/guifiles.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info_helper.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info_helper.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/info_helper.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/launch.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/launch.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/launch.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/menu.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/menu.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/menu.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/mkdir.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/mkdir.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/mkdir.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/move.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/move.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/move.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/remove.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/remove.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/remove.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/rename.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/rename.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/olive/rename.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/logview.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences.py
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tortoise-bzr.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.pyc
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/branch.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/checkout.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/commit.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/conflicts.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/dialog.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/diff.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/errors.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/history.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/logview.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/merge.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/missing.pyo
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/preferences.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/push.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revbrowser.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revidbox.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revidbox.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revidbox.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionmenu.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionmenu.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/revisionmenu.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/status.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tags.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_diff.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_diff.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_diff.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_history.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_preferences.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_preferences.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_preferences.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_tortoise_bzr.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_tortoise_bzr.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_tortoise_bzr.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_viz.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_viz.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tests/test_viz.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tortoise-bzr.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tortoise-bzr.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/tortoise-bzr.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.pyc
 %%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/ui.pyo
-%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/nautilus-bzr.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/__init__.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/branchwin.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graph.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graph.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graph.pyo
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graphcell.py
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graphcell.pyc
+%%PYTHON_SITELIBDIR%%/bzrlib/plugins/gtk/viz/graphcell.pyo
+%%PYTHON_SITELIBDIR%%/olive/__init__.py
+%%PYTHON_SITELIBDIR%%/olive/__init__.pyc
+%%PYTHON_SITELIBDIR%%/olive/__init__.pyo
+%%PYTHON_SITELIBDIR%%/olive/add.py
+%%PYTHON_SITELIBDIR%%/olive/add.pyc
+%%PYTHON_SITELIBDIR%%/olive/add.pyo
+%%PYTHON_SITELIBDIR%%/olive/bookmark.py
+%%PYTHON_SITELIBDIR%%/olive/bookmark.pyc
+%%PYTHON_SITELIBDIR%%/olive/bookmark.pyo
+%%PYTHON_SITELIBDIR%%/olive/guifiles.py
+%%PYTHON_SITELIBDIR%%/olive/guifiles.pyc
+%%PYTHON_SITELIBDIR%%/olive/guifiles.pyo
+%%PYTHON_SITELIBDIR%%/olive/info.py
+%%PYTHON_SITELIBDIR%%/olive/info.pyc
+%%PYTHON_SITELIBDIR%%/olive/info.pyo
+%%PYTHON_SITELIBDIR%%/olive/info_helper.py
+%%PYTHON_SITELIBDIR%%/olive/info_helper.pyc
+%%PYTHON_SITELIBDIR%%/olive/info_helper.pyo
+%%PYTHON_SITELIBDIR%%/olive/launch.py
+%%PYTHON_SITELIBDIR%%/olive/launch.pyc
+%%PYTHON_SITELIBDIR%%/olive/launch.pyo
+%%PYTHON_SITELIBDIR%%/olive/menu.py
+%%PYTHON_SITELIBDIR%%/olive/menu.pyc
+%%PYTHON_SITELIBDIR%%/olive/menu.pyo
+%%PYTHON_SITELIBDIR%%/olive/mkdir.py
+%%PYTHON_SITELIBDIR%%/olive/mkdir.pyc
+%%PYTHON_SITELIBDIR%%/olive/mkdir.pyo
+%%PYTHON_SITELIBDIR%%/olive/move.py
+%%PYTHON_SITELIBDIR%%/olive/move.pyc
+%%PYTHON_SITELIBDIR%%/olive/move.pyo
+%%PYTHON_SITELIBDIR%%/olive/remove.py
+%%PYTHON_SITELIBDIR%%/olive/remove.pyc
+%%PYTHON_SITELIBDIR%%/olive/remove.pyo
+%%PYTHON_SITELIBDIR%%/olive/rename.py
+%%PYTHON_SITELIBDIR%%/olive/rename.pyc
+%%PYTHON_SITELIBDIR%%/olive/rename.pyo
 share/olive/olive.glade
-share/olive/oliveicon2.png
 share/olive/cmenu.ui
 share/olive/commit.png
 share/olive/commit16.png
@@ -186,11 +200,14 @@ share/olive/diff.png
 share/olive/diff16.png
 share/olive/log.png
 share/olive/log16.png
+share/olive/oliveicon2.png
 share/olive/pull.png
 share/olive/pull16.png
 share/olive/push.png
 share/olive/push16.png
 share/olive/refresh.png
+share/applications/bazaar-properties.desktop
+share/applications/bzr-notify.desktop
 share/applications/olive-gtk.desktop
 share/pixmaps/olive-gtk.png
 @dirrm share/olive