Update to 1.3.1:

2009-08-14 meld-1.3.1
=====================

	* Add svk support (Vincent Legoll)

	* Add support for marking conflicts as resolved (Matthijs van de Water,
	  Vincent Legoll)

	* Warp the text cursor to the start of jumped-to diff chunks (Vincent
	  Legoll)

	* Allow toggling of toolbar and statusbar visibility, and add a fullscreen
	  option (Michael Budde, Stephen Kennedy, Kai Willadsen)

	* Improved change merging and conflict resolution (Piotr Piastucki)

	* Speed up file comparisons and highlighting, significantly improving
	  interactive editing performance (Kai Willadsen, Piotr Piastucki)

	* Meld has a shiny new application icon (Josef Vybíral)

3 files changed, 20 insertions, 13 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 02a7c545157..503b5911c13 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2009/07/22 09:01:23 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/08/21 08:30:30 wiz Exp $
 #
 
-DISTNAME=		meld-1.3.0
+DISTNAME=		meld-1.3.1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/1.3/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index 46d67552d6a..d2c16fee829 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:48:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2009/08/21 08:30:30 wiz Exp $
 bin/meld
 lib/meld/diffutil.py
 lib/meld/diffutil.pyc
@@ -27,6 +27,12 @@ lib/meld/melddoc.pyo
 lib/meld/misc.py
 lib/meld/misc.pyc
 lib/meld/misc.pyo
+lib/meld/msgarea.py
+lib/meld/msgarea.pyc
+lib/meld/msgarea.pyo
+lib/meld/notebooklabel.py
+lib/meld/notebooklabel.pyc
+lib/meld/notebooklabel.pyo
 lib/meld/paths.py
 lib/meld/paths.pyc
 lib/meld/paths.pyo
@@ -78,6 +84,9 @@ lib/meld/vc/monotone.pyo
 lib/meld/vc/rcs.py
 lib/meld/vc/rcs.pyc
 lib/meld/vc/rcs.pyo
+lib/meld/vc/svk.py
+lib/meld/vc/svk.pyc
+lib/meld/vc/svk.pyo
 lib/meld/vc/svn.py
 lib/meld/vc/svn.pyc
 lib/meld/vc/svn.pyo
@@ -87,7 +96,6 @@ lib/meld/vc/tla.pyo
 lib/meld/vcview.py
 lib/meld/vcview.pyc
 lib/meld/vcview.pyo
-share/application-registry/meld.applications
 share/applications/meld.desktop
 share/gnome/help/meld/C/figures/dirdiff.png
 share/gnome/help/meld/C/figures/filediff.png
@@ -108,6 +116,7 @@ share/locale/en_GB/LC_MESSAGES/meld.mo
 share/locale/es/LC_MESSAGES/meld.mo
 share/locale/fi/LC_MESSAGES/meld.mo
 share/locale/fr/LC_MESSAGES/meld.mo
+share/locale/gl/LC_MESSAGES/meld.mo
 share/locale/hu/LC_MESSAGES/meld.mo
 share/locale/it/LC_MESSAGES/meld.mo
 share/locale/ja/LC_MESSAGES/meld.mo
@@ -140,21 +149,18 @@ share/meld/glade2/pixmaps/button_apply1.xpm
 share/meld/glade2/pixmaps/button_copy0.xpm
 share/meld/glade2/pixmaps/button_copy1.xpm
 share/meld/glade2/pixmaps/button_delete.xpm
-share/meld/glade2/pixmaps/close.xpm
-share/meld/glade2/pixmaps/cvs-icon-small.png
-share/meld/glade2/pixmaps/cvs-icon.png
 share/meld/glade2/pixmaps/filter-ignored-24.png
 share/meld/glade2/pixmaps/filter-modified-24.png
 share/meld/glade2/pixmaps/filter-nonvc-24.png
 share/meld/glade2/pixmaps/filter-normal-24.png
 share/meld/glade2/pixmaps/icon.png
-share/meld/glade2/pixmaps/svn-icon-small.png
-share/meld/glade2/pixmaps/svn-icon.png
 share/meld/glade2/pixmaps/tree-file-changed.png
+share/meld/glade2/pixmaps/tree-file-missing.png
 share/meld/glade2/pixmaps/tree-file-new.png
 share/meld/glade2/pixmaps/tree-file-newer.png
 share/meld/glade2/pixmaps/tree-file-normal.png
 share/meld/glade2/pixmaps/tree-folder-changed.png
+share/meld/glade2/pixmaps/tree-folder-missing.png
 share/meld/glade2/pixmaps/tree-folder-new.png
 share/meld/glade2/pixmaps/tree-folder-normal.png
 share/meld/glade2/pixmaps/vc-add-24.png
@@ -162,6 +168,7 @@ share/meld/glade2/pixmaps/vc-checkout-24.png
 share/meld/glade2/pixmaps/vc-commit-24.png
 share/meld/glade2/pixmaps/vc-icon.png
 share/meld/glade2/pixmaps/vc-remove-24.png
+share/meld/glade2/pixmaps/vc-resolve-24.png
 share/meld/glade2/pixmaps/vc-update-24.png
 share/meld/glade2/vcview-ui.xml
 share/meld/glade2/vcview.glade
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index a739ac8e30f..ab4fd9a111d 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2009/04/20 10:53:58 wiz Exp $
+$NetBSD: distinfo,v 1.8 2009/08/21 08:30:30 wiz Exp $
 
-SHA1 (meld-1.3.0.tar.bz2) = a8b53d3f3e4ff1ededfef4ce500c2d664cb3af75
-RMD160 (meld-1.3.0.tar.bz2) = d001f2a74fe25f2bf6539bc29e9d9be8b5f4a94b
-Size (meld-1.3.0.tar.bz2) = 799554 bytes
+SHA1 (meld-1.3.1.tar.bz2) = d3ab96a364b73afdfd9f26cc9bec18321f04c9df
+RMD160 (meld-1.3.1.tar.bz2) = bf9bace33ddf1d3b6b99e358799316791390cec0
+Size (meld-1.3.1.tar.bz2) = 795145 bytes
 SHA1 (patch-aa) = 49ff28a613055ead56f63e8dd5df09b986bcbea1