Update to 1.5.1:

2011-3-20 meld 1.5.1
=====================

  New features:

    * Add menu items and keyboard shortcuts for version control and directory
      comparison actions (Kai Willadsen)
    * Add support for the Fossil SCM (Jan Danielsson)
    * Add a menu for switching between tabs (Kai Willadsen)
    * Add a menu item to unlock scrolling (Kai Willadsen)

  Code changes and fixes:

    * Improve filter handling with inline error reporting in the preference
      pane, and correct refreshing of file and directory comparisons on filter
      changes (Kai Willadsen)
    * Make line number display work with GtkSourceView 2.10+ (Piotr Piastucki)
    * Support external diff tools in subversion (Cedric Le Dillau)
    * Support CVSNT as a CVS alternative (Kai Willadsen)
    * Performance fixes for subversion and bazaar (Tristan Hill, Kirill Müller)
    * Correctly update a modified file's status in git and svn version control
      views (Peter Tyser)
    * Make temporary files unwritable to avoid unintentionally editing them
      (Peter Tyser)
    * Clean up diff results for cleaner comparisons (Piotr Piastucki)
    * Improve symlink and binary handling, and error cases for directory
      comparisons (Kai Willadsen)
    * Improve copy semantics for directories and symlinks (Kai Willadsen)
    * Show case insensitivity and file encoding errors less intrusively (Kai
      Willadsen)
    * Sundry bug fixes (Kai Willadsen, Piotr Piastucki)

  Translation updates:
    * Bruno Brouard (fr)
    * Claude Paroz (fr)
    * Daniel Mustieles (es)
    * Joe Hansen (da)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Miroslav Nikolić (sr)
    * Petr Kovar (cs)
    * Takeshi AIHANA (ja)


2010-12-27 meld 1.5.0
=====================

  New features:

    * Use MyersSequenceMatcher by default (matcher from Piotr Piastucki)
    * Add a "Show whitespace" preference (Jon Dufresne)
    * Add "Copy change above/below left/right" actions (Kai Willadsen)
    * Add Alt+Up/Down as shortcuts for previous/next change (Kai Willadsen)
    * Add previous/next conflict actions (Kai Willadsen)
    * Patch creation can now create reverse patches, and can choose between
      panes in a three-way comparison (Kai Willadsen)
    * Add a --output option for specifying where to save a merge result
      (Kai Willadsen)

  Code changes and fixes:

    * Require Python 2.5, Gtk+/PyGtk 2.14, PyGtkSourceView 2.4 (optional)
    * Port to gtk.Builder and gtk.IconTheme (Kai Willadsen)
    * Remove gnome-vfs usage (Kai Willadsen)
    * Portability fixes (Thomas Klausner)
    * Build fixes (Helmut Jarausch)
    * Add a man page (Peter Tyser)
    * Put preferences fallback in XDG-compliant location (Kai Willadsen)
    * Fix Undo/Redo with unicode text (Kai Willadsen)
    * Handle unicode linebreaks (Kai Willadsen)

  Translation updates:

    * Bruno Brouard (fr)
    * Carles Ferrando (ca@valencia)
    * Claude Paroz (fr)
    * Gabor Kelemen (hu)
    * Joe Hansen (da)
    * Jorge González (es)
    * Mario Blättermann (de)
    * Matej Urbančič (sl)
    * Petr Kovar (cs)

3 files changed, 47 insertions, 28 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index b926c26aa39..7424f16710f 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2010/10/16 15:15:15 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2011/04/05 13:08:34 wiz Exp $
 #
 
-DISTNAME=		meld-1.4.0
+DISTNAME=		meld-1.5.1
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/1.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/1.5/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		dieter.NetBSD@pandora.be
@@ -11,10 +11,12 @@ HOMEPAGE=		http://meld.sourceforge.net/
 COMMENT=		Visual diff and merge tool
 LICENSE=		gnu-gpl-v2
 
-DEPENDS+=		${PYPKGPREFIX}-gtk2>=2.8.0:../../x11/py-gtk2
+DEPENDS+=		${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+PYTHON_VERSIONS_INCOMPATIBLE=	24
+
 USE_PKGLOCALEDIR=		YES
 USE_TOOLS+=			gmake msgfmt intltool
 MAKE_FLAGS+=			prefix=${PREFIX}
@@ -22,9 +24,10 @@ MAKE_FLAGS+=			localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 MAKE_FLAGS+=			PYTHON=${PYTHONBIN}
 PYTHON_PATCH_SCRIPTS=		bin/meld
 
-# remove unnecessarily created empty dir
+# remove unnecessarily created empty dirs
 post-install:
 	${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld
+	${RMDIR} ${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index 83fa42bb5cb..5167561de27 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2010/09/13 12:33:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2011/04/05 13:08:34 wiz Exp $
 bin/meld
 lib/meld/meld/__init__.py
 lib/meld/meld/__init__.pyc
@@ -27,12 +27,18 @@ lib/meld/meld/meldapp.pyo
 lib/meld/meld/melddoc.py
 lib/meld/meld/melddoc.pyc
 lib/meld/meld/melddoc.pyo
+lib/meld/meld/meldwindow.py
+lib/meld/meld/meldwindow.pyc
+lib/meld/meld/meldwindow.pyo
 lib/meld/meld/merge.py
 lib/meld/meld/merge.pyc
 lib/meld/meld/merge.pyo
 lib/meld/meld/misc.py
 lib/meld/meld/misc.pyc
 lib/meld/meld/misc.pyo
+lib/meld/meld/patchdialog.py
+lib/meld/meld/patchdialog.pyc
+lib/meld/meld/patchdialog.pyo
 lib/meld/meld/paths.py
 lib/meld/meld/paths.pyc
 lib/meld/meld/paths.pyo
@@ -48,15 +54,24 @@ lib/meld/meld/tree.pyo
 lib/meld/meld/ui/__init__.py
 lib/meld/meld/ui/__init__.pyc
 lib/meld/meld/ui/__init__.pyo
+lib/meld/meld/ui/emblemcellrenderer.py
+lib/meld/meld/ui/emblemcellrenderer.pyc
+lib/meld/meld/ui/emblemcellrenderer.pyo
 lib/meld/meld/ui/findbar.py
 lib/meld/meld/ui/findbar.pyc
 lib/meld/meld/ui/findbar.pyo
+lib/meld/meld/ui/gladesupport.py
+lib/meld/meld/ui/gladesupport.pyc
+lib/meld/meld/ui/gladesupport.pyo
 lib/meld/meld/ui/gnomeglade.py
 lib/meld/meld/ui/gnomeglade.pyc
 lib/meld/meld/ui/gnomeglade.pyo
 lib/meld/meld/ui/historyentry.py
 lib/meld/meld/ui/historyentry.pyc
 lib/meld/meld/ui/historyentry.pyo
+lib/meld/meld/ui/listwidget.py
+lib/meld/meld/ui/listwidget.pyc
+lib/meld/meld/ui/listwidget.pyo
 lib/meld/meld/ui/msgarea.py
 lib/meld/meld/ui/msgarea.pyc
 lib/meld/meld/ui/msgarea.pyo
@@ -72,6 +87,9 @@ lib/meld/meld/undo.pyo
 lib/meld/meld/util/__init__.py
 lib/meld/meld/util/__init__.pyc
 lib/meld/meld/util/__init__.pyo
+lib/meld/meld/util/namedtuple.py
+lib/meld/meld/util/namedtuple.pyc
+lib/meld/meld/util/namedtuple.pyo
 lib/meld/meld/util/prefs.py
 lib/meld/meld/util/prefs.pyc
 lib/meld/meld/util/prefs.pyo
@@ -99,6 +117,9 @@ lib/meld/meld/vc/cvs.pyo
 lib/meld/meld/vc/darcs.py
 lib/meld/meld/vc/darcs.pyc
 lib/meld/meld/vc/darcs.pyo
+lib/meld/meld/vc/fossil.py
+lib/meld/meld/vc/fossil.pyc
+lib/meld/meld/vc/fossil.pyo
 lib/meld/meld/vc/git.py
 lib/meld/meld/vc/git.pyc
 lib/meld/meld/vc/git.pyo
@@ -135,7 +156,9 @@ share/icons/hicolor/scalable/apps/meld.svg
 share/locale/ar/LC_MESSAGES/meld.mo
 share/locale/bg/LC_MESSAGES/meld.mo
 share/locale/ca/LC_MESSAGES/meld.mo
+share/locale/ca@valencia/LC_MESSAGES/meld.mo
 share/locale/cs/LC_MESSAGES/meld.mo
+share/locale/da/LC_MESSAGES/meld.mo
 share/locale/de/LC_MESSAGES/meld.mo
 share/locale/dz/LC_MESSAGES/meld.mo
 share/locale/el/LC_MESSAGES/meld.mo
@@ -171,20 +194,13 @@ share/meld/icons/button_apply1.xpm
 share/meld/icons/button_copy0.xpm
 share/meld/icons/button_copy1.xpm
 share/meld/icons/button_delete.xpm
+share/meld/icons/emblem-meld-newer-file.png
 share/meld/icons/filter-ignored-24.png
 share/meld/icons/filter-modified-24.png
 share/meld/icons/filter-nonvc-24.png
 share/meld/icons/filter-normal-24.png
-share/meld/icons/icon.png
-share/meld/icons/tree-file-changed.png
-share/meld/icons/tree-file-missing.png
-share/meld/icons/tree-file-new.png
-share/meld/icons/tree-file-newer.png
-share/meld/icons/tree-file-normal.png
-share/meld/icons/tree-folder-changed.png
-share/meld/icons/tree-folder-missing.png
-share/meld/icons/tree-folder-new.png
-share/meld/icons/tree-folder-normal.png
+share/meld/icons/meld-locked.png
+share/meld/icons/meld-unlocked.png
 share/meld/icons/vc-add-24.png
 share/meld/icons/vc-checkout-24.png
 share/meld/icons/vc-commit-24.png
@@ -192,17 +208,18 @@ share/meld/icons/vc-icon.png
 share/meld/icons/vc-remove-24.png
 share/meld/icons/vc-resolve-24.png
 share/meld/icons/vc-update-24.png
+share/meld/ui/EditableList.ui
 share/meld/ui/dirdiff-ui.xml
-share/meld/ui/dirdiff.glade
+share/meld/ui/dirdiff.ui
 share/meld/ui/filediff-ui.xml
-share/meld/ui/filediff.glade
-share/meld/ui/findbar.glade
+share/meld/ui/filediff.ui
+share/meld/ui/findbar.ui
 share/meld/ui/meldapp-ui.xml
-share/meld/ui/meldapp.glade
-share/meld/ui/preferences.glade
+share/meld/ui/meldapp.ui
+share/meld/ui/patch-dialog.ui
+share/meld/ui/preferences.ui
 share/meld/ui/vcview-ui.xml
-share/meld/ui/vcview.glade
+share/meld/ui/vcview.ui
 share/omf/meld/meld-C.omf
 share/omf/meld/meld-es.omf
 share/omf/meld/meld-fr.omf
-share/pixmaps/meld.png
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index fe4da088af0..d3538cba5b1 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2010/10/16 15:15:15 wiz Exp $
+$NetBSD: distinfo,v 1.12 2011/04/05 13:08:35 wiz Exp $
 
-SHA1 (meld-1.4.0.tar.bz2) = 2db6d610f1d1e2ef2bd0e0027695e72f6f6a6ac9
-RMD160 (meld-1.4.0.tar.bz2) = 5e244b450cd1a11b8eeb8176a77043a0a6eff63a
-Size (meld-1.4.0.tar.bz2) = 333793 bytes
-SHA1 (patch-ac) = 2688060101a1aa756b235ac8542f652baf098ae7
+SHA1 (meld-1.5.1.tar.bz2) = cf87316307bd3511ba79b5b9144efed87f0edef3
+RMD160 (meld-1.5.1.tar.bz2) = 2ebce6f9209295fe67d7e471c8ecac844c9dbc97
+Size (meld-1.5.1.tar.bz2) = 343099 bytes