Update to 0.100.0 from wip prepared by maintainer.

  Tested on current and Linux.

4 files changed, 22 insertions, 78 deletions

diff --git a/devel/bzr-gtk/MESSAGE b/devel/bzr-gtk/MESSAGE
index 1335e48113a..a183bf3b25f 100644
--- a/devel/bzr-gtk/MESSAGE
+++ b/devel/bzr-gtk/MESSAGE
@@ -1,7 +1,6 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2008/08/26 01:20:25 epg Exp $
+$NetBSD: MESSAGE,v 1.2 2011/11/27 14:20:18 cheusov Exp $
 
 bzr-gtk requires x11/py-gnome2-desktop to show syntax highlighted diffs.
-Nautilus integration is not yet supported.
 
 ===========================================================================
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index bb1e08bfb96..4c2a23d8986 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.12 2011/02/25 09:47:20 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2011/11/27 14:20:18 cheusov Exp $
 
 DISTNAME=	bzr-gtk-${VER}
 CATEGORIES=	devel
-MASTER_SITES=	http://launchpad.net/bzr-gtk/trunk/${VER}/+download/
-VER=		0.98.0
+MASTER_SITES=	http://launchpad.net/bzr-gtk/gtk2/${VER}/+download/
+VER=		0.100.0
 
-MAINTAINER=	jan.m.danielsson@gmail.com
+MAINTAINER=	ddeus.pkgsrc@mailnull.com
 HOMEPAGE=	http://bazaar-vcs.org/bzr-gtk
 COMMENT=	Various GTK+ frontends to Bazaar commands
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -15,16 +16,16 @@ DEPENDS+=	${PYPKGPREFIX}-cairo>=1.0:../../graphics/py-cairo
 DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_ACCEPTED=	27 26 25
-REPLACE_PYTHON=	create-credits.py
+REPLACE_PYTHON=	create-credits.py info.py
+# Only this python versions are supported, see:
+# http://doc.bazaar.canonical.com/bzr.dev/en/whats-new/whats-new-in-2.4.html
+PYTHON_VERSIONS_ACCEPTED=	27 26
 
 USE_TOOLS+=	msgfmt
 
 # Insists on working X display, and fails anyway, so disable.
 BZR_PLUGIN_TEST=no
 
-PRIVILEGED_STAGES+=	clean
-
 .include "../../devel/bzr/plugin.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/bzr-gtk/PLIST b/devel/bzr-gtk/PLIST
index 21da8718f7e..b332746cf32 100644
--- a/devel/bzr-gtk/PLIST
+++ b/devel/bzr-gtk/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2009/09/09 05:44:03 epg Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/11/27 14:20:18 cheusov Exp $
 bin/bzr-handle-patch
 bin/bzr-notify
-bin/olive-gtk
 ${PYSITELIB}/bzrlib/plugins/gtk/__init__.py
 ${PYSITELIB}/bzrlib/plugins/gtk/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/__init__.pyo
@@ -68,12 +67,18 @@ ${PYSITELIB}/bzrlib/plugins/gtk/errors.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/history.py
 ${PYSITELIB}/bzrlib/plugins/gtk/history.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/history.pyo
+${PYSITELIB}/bzrlib/plugins/gtk/info.py
+${PYSITELIB}/bzrlib/plugins/gtk/info.pyc
+${PYSITELIB}/bzrlib/plugins/gtk/info.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/initialize.py
 ${PYSITELIB}/bzrlib/plugins/gtk/initialize.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/initialize.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/keyring.py
 ${PYSITELIB}/bzrlib/plugins/gtk/keyring.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/keyring.pyo
+${PYSITELIB}/bzrlib/plugins/gtk/lock.py
+${PYSITELIB}/bzrlib/plugins/gtk/lock.pyc
+${PYSITELIB}/bzrlib/plugins/gtk/lock.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/loom.py
 ${PYSITELIB}/bzrlib/plugins/gtk/loom.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/loom.pyo
@@ -92,45 +97,6 @@ ${PYSITELIB}/bzrlib/plugins/gtk/nautilus-bzr.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/notify.py
 ${PYSITELIB}/bzrlib/plugins/gtk/notify.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/notify.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/__init__.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/__init__.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/__init__.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/add.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/add.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/add.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/bookmark.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/bookmark.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/bookmark.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/guifiles.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/guifiles.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/guifiles.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/info.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/info.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/info.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/info_helper.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/info_helper.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/info_helper.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/launch.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/launch.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/launch.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/menu.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/menu.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/menu.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/mkdir.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/mkdir.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/mkdir.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/move.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/move.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/move.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/remove.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/remove.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/remove.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/rename.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/rename.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/rename.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/olive/window.py
-${PYSITELIB}/bzrlib/plugins/gtk/olive/window.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/olive/window.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/preferences/__init__.py
 ${PYSITELIB}/bzrlib/plugins/gtk/preferences/__init__.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/preferences/__init__.pyo
@@ -188,9 +154,6 @@ ${PYSITELIB}/bzrlib/plugins/gtk/tests/test_history.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/tests/test_linegraph.py
 ${PYSITELIB}/bzrlib/plugins/gtk/tests/test_linegraph.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/tests/test_linegraph.pyo
-${PYSITELIB}/bzrlib/plugins/gtk/tests/test_preferences.py
-${PYSITELIB}/bzrlib/plugins/gtk/tests/test_preferences.pyc
-${PYSITELIB}/bzrlib/plugins/gtk/tests/test_preferences.pyo
 ${PYSITELIB}/bzrlib/plugins/gtk/tests/test_revisionview.py
 ${PYSITELIB}/bzrlib/plugins/gtk/tests/test_revisionview.pyc
 ${PYSITELIB}/bzrlib/plugins/gtk/tests/test_revisionview.pyo
@@ -210,7 +173,6 @@ share/application-registry/bzr-gtk.applications
 share/applications/bazaar-properties.desktop
 share/applications/bzr-handle-patch.desktop
 share/applications/bzr-notify.desktop
-share/applications/olive-gtk.desktop
 share/bzr-gtk/credits.pickle
 share/bzr-gtk/icons/bug.png
 share/bzr-gtk/icons/bzr-icon-64.png
@@ -220,8 +182,6 @@ share/bzr-gtk/icons/diff.png
 share/bzr-gtk/icons/diff16.png
 share/bzr-gtk/icons/log.png
 share/bzr-gtk/icons/log16.png
-share/bzr-gtk/icons/olive-gtk.png
-share/bzr-gtk/icons/oliveicon2.png
 share/bzr-gtk/icons/pull.png
 share/bzr-gtk/icons/pull16.png
 share/bzr-gtk/icons/push.png
@@ -232,27 +192,11 @@ share/bzr-gtk/icons/sign-ok.png
 share/bzr-gtk/icons/sign-unknown.png
 share/bzr-gtk/icons/sign.png
 share/bzr-gtk/icons/tag-16.png
+share/icons/hicolor/scalable/apps/bzr-panel.svg
 share/icons/hicolor/scalable/emblems/emblem-bzr-added.svg
 share/icons/hicolor/scalable/emblems/emblem-bzr-conflict.svg
 share/icons/hicolor/scalable/emblems/emblem-bzr-controlled.svg
 share/icons/hicolor/scalable/emblems/emblem-bzr-ignored.svg
 share/icons/hicolor/scalable/emblems/emblem-bzr-modified.svg
 share/icons/hicolor/scalable/emblems/emblem-bzr-removed.svg
-share/locale/ca/LC_MESSAGES/olive-gtk.mo
-share/locale/cs/LC_MESSAGES/olive-gtk.mo
-share/locale/de/LC_MESSAGES/olive-gtk.mo
-share/locale/en_GB/LC_MESSAGES/olive-gtk.mo
-share/locale/es/LC_MESSAGES/olive-gtk.mo
-share/locale/fr/LC_MESSAGES/olive-gtk.mo
-share/locale/hu/LC_MESSAGES/olive-gtk.mo
-share/locale/id/LC_MESSAGES/olive-gtk.mo
-share/locale/it/LC_MESSAGES/olive-gtk.mo
-share/locale/ku/LC_MESSAGES/olive-gtk.mo
-share/locale/pl/LC_MESSAGES/olive-gtk.mo
-share/locale/pt_BR/LC_MESSAGES/olive-gtk.mo
-share/locale/ru/LC_MESSAGES/olive-gtk.mo
-share/locale/sr/LC_MESSAGES/olive-gtk.mo
-share/locale/sv/LC_MESSAGES/olive-gtk.mo
-share/olive/cmenu.ui
 share/pixmaps/bzr-icon-64.png
-share/pixmaps/olive-gtk.png
diff --git a/devel/bzr-gtk/distinfo b/devel/bzr-gtk/distinfo
index 63a1c8cbd6e..1de556f9ed1 100644
--- a/devel/bzr-gtk/distinfo
+++ b/devel/bzr-gtk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/12/04 01:27:52 gdt Exp $
+$NetBSD: distinfo,v 1.4 2011/11/27 14:20:18 cheusov Exp $
 
-SHA1 (bzr-gtk-0.98.0.tar.gz) = 3b1a2f3e5dbc45763ab4a69b4b4ca84bdc49a836
-RMD160 (bzr-gtk-0.98.0.tar.gz) = 5a890f24a0de55092d6892872b5ae6fec3e68165
-Size (bzr-gtk-0.98.0.tar.gz) = 243271 bytes
+SHA1 (bzr-gtk-0.100.0.tar.gz) = 6f1a55a4011b6e8084783fdc3b07233c3f4fb77a
+RMD160 (bzr-gtk-0.100.0.tar.gz) = 783d099d9be700193c1523a8c6d54826ada49187
+Size (bzr-gtk-0.100.0.tar.gz) = 220559 bytes