Update to 1.7.3:

2013-5-4 meld 1.7.3
====================

  Features:

    * Support launching conflict comparisons from Subversion (Louis des
      Landes)
    * The external text editor setting now supports opening files at a
      particular line number (Konstantin Starojitski)

    * A host of minor improvements to the version control UI, including:
      * Add a new Push action for VC modules, currently supported in Git (Kai
        Willadsen)
      * Show a summary of unpushed commits, currently supported in Git (Kai
        Willadsen)
      * Reworked commit dialog, including more details about files to be
        committed and more useful previous-log selection (Kai Willadsen)
      * Console output for VC comparisons is now formatted to better
        distinguish commands, output and errors (Kai Willadsen)
      * Support better sensitivity handling in VC comparisons, currently
        implemented by Git (Kai Willadsen)

    * Sundry minor UI improvements:
      * Much HIG-ification and better wording for actions, dialogs and
        labels (Kai Willadsen, with diligent bug reporting from Adam Dingle)
      * Make columns user-resizable in version control and folder comparisons
        (Kai Willadsen)
      * There is now a Save All action, to save all modified files in the
        current comparison (Kai Willadsen)
      * Rather than giving up on long inline-highlighting comparisons, Meld
        now prompts to continue the comparison (Kai Willadsen)
      * F5 is now a additional shortcut for Refresh (Kai Willadsen)
      * Reload has been renamed to Revert and its UI has been improved for
        file comparisons (Kai Willadsen)

  Fixes:

    * Version control updates and miscellaneous fixes (Dominique Leuenberger,
      Louis des Landes, Timothy Babych, Kai Willadsen)
    * When guessing file types for syntax highlighting, we now use file
      contents as well as extension (Kai Willadsen)
    * Prev/Next Change navigation now centres changes slightly more
      aggressively (Kai Willadsen)

  Translations:
    * Daniel Mustieles (es)
    * Gabor Kelemen (hu)
    * Inaki Larranaga Murgoitio (eu)
    * Jiro Matsuzawa (ja)
    * Marek Černocký (cs)
    * Martin Srebotnjak (sl)
    * Matej Urbančič (sl)
    * Pere Orga (ca)
    * Piotr Drąg (pl)
    * Rafael Ferreira (pt_BR)
    * Мирослав Николић (sr, sr@latin)

3 files changed, 11 insertions, 8 deletions

diff --git a/devel/meld/Makefile b/devel/meld/Makefile
index 5d49c8c4656..38d2580b46b 100644
--- a/devel/meld/Makefile
+++ b/devel/meld/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2013/04/21 14:46:34 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.38 2013/06/04 18:51:59 wiz Exp $
 
-DISTNAME=		meld-1.7.2
+DISTNAME=		meld-1.7.3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/meld/1.7/}
 EXTRACT_SUFX=		.tar.xz
@@ -25,6 +24,7 @@ post-install:
 	${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld
 	${RMDIR} ${DESTDIR}${PREFIX}/share/pixmaps
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
diff --git a/devel/meld/PLIST b/devel/meld/PLIST
index 1fee6999f3f..d17bdfbdfbc 100644
--- a/devel/meld/PLIST
+++ b/devel/meld/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2013/04/21 14:46:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/06/04 18:51:59 wiz Exp $
 bin/meld
 lib/meld/meld/__init__.py
 lib/meld/meld/__init__.pyc
@@ -194,6 +194,7 @@ share/locale/en_CA/LC_MESSAGES/meld.mo
 share/locale/en_GB/LC_MESSAGES/meld.mo
 share/locale/eo/LC_MESSAGES/meld.mo
 share/locale/es/LC_MESSAGES/meld.mo
+share/locale/eu/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
@@ -233,10 +234,12 @@ share/meld/icons/filter-nonvc-24.png
 share/meld/icons/filter-normal-24.png
 share/meld/icons/meld-locked.png
 share/meld/icons/meld-unlocked.png
+share/meld/icons/meld-vc-icon.png
 share/meld/icons/vc-add-24.png
 share/meld/icons/vc-checkout-24.png
 share/meld/icons/vc-commit-24.png
 share/meld/icons/vc-icon.png
+share/meld/icons/vc-push-24.png
 share/meld/icons/vc-remove-24.png
 share/meld/icons/vc-resolve-24.png
 share/meld/icons/vc-update-24.png
diff --git a/devel/meld/distinfo b/devel/meld/distinfo
index da56cbc9564..80723dbdcb8 100644
--- a/devel/meld/distinfo
+++ b/devel/meld/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2013/04/21 14:46:34 wiz Exp $
+$NetBSD: distinfo,v 1.20 2013/06/04 18:51:59 wiz Exp $
 
-SHA1 (meld-1.7.2.tar.xz) = 660e47ceb06fd9035a6fcac12da373f8a60fec31
-RMD160 (meld-1.7.2.tar.xz) = 2235faf1ad41f182bcf0ab36072fc9b7701a9b01
-Size (meld-1.7.2.tar.xz) = 379300 bytes
+SHA1 (meld-1.7.3.tar.xz) = dc79d6a437a885fcd8dd98437ed074d2a122aa8a
+RMD160 (meld-1.7.3.tar.xz) = 883d6deb04dab2f4150e9d23d83b387d79097115
+Size (meld-1.7.3.tar.xz) = 398636 bytes