Sun Apr 21 14:46:34 2013 UTC ()
Update to 1.7.2:

2013-4-16 meld 1.7.2
====================

  Features:

    * In version control view, conflicts now open in a three-way merge mode
      for Bazaar and Git, with other VCs to follow (Louis des Landes)
    * Manual synchronisation of split points for comparisons (Piotr Piastucki,
      Kai Willadsen)
    * The "Ignore blank lines" setting is now used in folder comparisons, in
      same manner as text filters (Kai Willadsen)

  Fixes:

    * Many minor Windows compatibility fixes (Vincent Legoll, Robert Wahler,
      Kai Willadsen)
    * Version control compatibility updates and fixes (Manuel Siggen, Kai
      Willadsen)
    * Better handling of Unicode filenames (Kai Willadsen)
    * Better support for cross-platform newline behaviour, particularly on
      Windows (Kai Willadsen)
    * Sensitivity fixes for file and folder comparisons (Kai Willadsen)
    * Build and installation fixes (Kalev Lember, Kai Willadsen)

  Translations:

    * Daniel Mustieles (es)
    * Gabor Kelemen (hu)
    * Marek Černocký (cs)
    * Martin Srebotnjak (sl).
    * Matej Urbančič (sl)
    * Мирослав Николић (sr, sr@latin)
    * Piotr Drąg (pl)
    * Rafael Ferreira (pt_BR)


(wiz)
diff -r1.36 -r1.37 pkgsrc/devel/meld/Makefile
diff -r1.16 -r1.17 pkgsrc/devel/meld/PLIST
diff -r1.18 -r1.19 pkgsrc/devel/meld/distinfo
cvs diff -r1.36 -r1.37 pkgsrc/devel/meld/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/meld/Makefile 2013/03/15 22:00:57 1.36
+++ pkgsrc/devel/meld/Makefile 2013/04/21 14:46:34 1.37
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.36 2013/03/15 22:00:57 wiz Exp $ 1# $NetBSD: Makefile,v 1.37 2013/04/21 14:46:34 wiz Exp $
2# 2#
3 3
4DISTNAME= meld-1.7.1 4DISTNAME= meld-1.7.2
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.7/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.7/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= dieter.NetBSD@pandora.be 9MAINTAINER= dieter.NetBSD@pandora.be
10HOMEPAGE= http://meldmerge.org/ 10HOMEPAGE= http://meldmerge.org/
11COMMENT= Visual diff and merge tool 11COMMENT= Visual diff and merge tool
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2 14DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2
15 15
16USE_PKGLOCALEDIR= YES 16USE_PKGLOCALEDIR= YES
17USE_TOOLS+= gmake msgfmt intltool 17USE_TOOLS+= gmake msgfmt intltool
cvs diff -r1.16 -r1.17 pkgsrc/devel/meld/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/meld/PLIST 2013/03/15 22:00:58 1.16
+++ pkgsrc/devel/meld/PLIST 2013/04/21 14:46:34 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.16 2013/03/15 22:00:58 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.17 2013/04/21 14:46:34 wiz Exp $
2bin/meld 2bin/meld
3lib/meld/meld/__init__.py 3lib/meld/meld/__init__.py
4lib/meld/meld/__init__.pyc 4lib/meld/meld/__init__.pyc
5lib/meld/meld/__init__.pyo 5lib/meld/meld/__init__.pyo
6lib/meld/meld/dbus_service.py 6lib/meld/meld/dbus_service.py
7lib/meld/meld/dbus_service.pyc 7lib/meld/meld/dbus_service.pyc
8lib/meld/meld/dbus_service.pyo 8lib/meld/meld/dbus_service.pyo
9lib/meld/meld/diffmap.py 9lib/meld/meld/diffmap.py
10lib/meld/meld/diffmap.pyc 10lib/meld/meld/diffmap.pyc
11lib/meld/meld/diffmap.pyo 11lib/meld/meld/diffmap.pyo
12lib/meld/meld/diffutil.py 12lib/meld/meld/diffutil.py
13lib/meld/meld/diffutil.pyc 13lib/meld/meld/diffutil.pyc
14lib/meld/meld/diffutil.pyo 14lib/meld/meld/diffutil.pyo
@@ -56,26 +56,29 @@ lib/meld/meld/patchdialog.pyc @@ -56,26 +56,29 @@ lib/meld/meld/patchdialog.pyc
56lib/meld/meld/patchdialog.pyo 56lib/meld/meld/patchdialog.pyo
57lib/meld/meld/paths.py 57lib/meld/meld/paths.py
58lib/meld/meld/paths.pyc 58lib/meld/meld/paths.pyc
59lib/meld/meld/paths.pyo 59lib/meld/meld/paths.pyo
60lib/meld/meld/preferences.py 60lib/meld/meld/preferences.py
61lib/meld/meld/preferences.pyc 61lib/meld/meld/preferences.pyc
62lib/meld/meld/preferences.pyo 62lib/meld/meld/preferences.pyo
63lib/meld/meld/recent.py 63lib/meld/meld/recent.py
64lib/meld/meld/recent.pyc 64lib/meld/meld/recent.pyc
65lib/meld/meld/recent.pyo 65lib/meld/meld/recent.pyo
66lib/meld/meld/task.py 66lib/meld/meld/task.py
67lib/meld/meld/task.pyc 67lib/meld/meld/task.pyc
68lib/meld/meld/task.pyo 68lib/meld/meld/task.pyo
 69lib/meld/meld/test_matchers.py
 70lib/meld/meld/test_matchers.pyc
 71lib/meld/meld/test_matchers.pyo
69lib/meld/meld/tree.py 72lib/meld/meld/tree.py
70lib/meld/meld/tree.pyc 73lib/meld/meld/tree.pyc
71lib/meld/meld/tree.pyo 74lib/meld/meld/tree.pyo
72lib/meld/meld/ui/__init__.py 75lib/meld/meld/ui/__init__.py
73lib/meld/meld/ui/__init__.pyc 76lib/meld/meld/ui/__init__.pyc
74lib/meld/meld/ui/__init__.pyo 77lib/meld/meld/ui/__init__.pyo
75lib/meld/meld/ui/emblemcellrenderer.py 78lib/meld/meld/ui/emblemcellrenderer.py
76lib/meld/meld/ui/emblemcellrenderer.pyc 79lib/meld/meld/ui/emblemcellrenderer.pyc
77lib/meld/meld/ui/emblemcellrenderer.pyo 80lib/meld/meld/ui/emblemcellrenderer.pyo
78lib/meld/meld/ui/findbar.py 81lib/meld/meld/ui/findbar.py
79lib/meld/meld/ui/findbar.pyc 82lib/meld/meld/ui/findbar.pyc
80lib/meld/meld/ui/findbar.pyo 83lib/meld/meld/ui/findbar.pyo
81lib/meld/meld/ui/gladesupport.py 84lib/meld/meld/ui/gladesupport.py
cvs diff -r1.18 -r1.19 pkgsrc/devel/meld/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/meld/distinfo 2013/03/15 22:00:58 1.18
+++ pkgsrc/devel/meld/distinfo 2013/04/21 14:46:34 1.19
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.18 2013/03/15 22:00:58 wiz Exp $ 1$NetBSD: distinfo,v 1.19 2013/04/21 14:46:34 wiz Exp $
2 2
3SHA1 (meld-1.7.1.tar.xz) = 904afbb911671cd7abb9fe394908704fe7ae723e 3SHA1 (meld-1.7.2.tar.xz) = 660e47ceb06fd9035a6fcac12da373f8a60fec31
4RMD160 (meld-1.7.1.tar.xz) = 818e9293c7aeda496fe73adcd7ee535bd1f24148 4RMD160 (meld-1.7.2.tar.xz) = 2235faf1ad41f182bcf0ab36072fc9b7701a9b01
5Size (meld-1.7.1.tar.xz) = 374060 bytes 5Size (meld-1.7.2.tar.xz) = 379300 bytes