diff options
| author | wiz <wiz> | 2013-04-21 14:46:34 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2013-04-21 14:46:34 +0000 |
| commit | 62154e4c2990dae5654be35cec89eb9a0655eb56 (patch) | |
| tree | ad4e18751f2611fb31ac42fd9645b47af17ab038 | |
| parent | 4de3ad93e0de39988f20ace24afb4417563a04ad (diff) | |
| download | pkgsrc-62154e4c2990dae5654be35cec89eb9a0655eb56.tar.gz | |
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)
| -rw-r--r-- | devel/meld/Makefile | 4 | ||||
| -rw-r--r-- | devel/meld/PLIST | 5 | ||||
| -rw-r--r-- | devel/meld/distinfo | 8 |
3 files changed, 10 insertions, 7 deletions
diff --git a/devel/meld/Makefile b/devel/meld/Makefile index 5d7bac846e7..5d49c8c4656 100644 --- a/devel/meld/Makefile +++ b/devel/meld/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2013/03/15 22:00:57 wiz Exp $ +# $NetBSD: Makefile,v 1.37 2013/04/21 14:46:34 wiz Exp $ # -DISTNAME= meld-1.7.1 +DISTNAME= meld-1.7.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.7/} EXTRACT_SUFX= .tar.xz diff --git a/devel/meld/PLIST b/devel/meld/PLIST index c07203796f1..1fee6999f3f 100644 --- a/devel/meld/PLIST +++ b/devel/meld/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2013/03/15 22:00:58 wiz Exp $ +@comment $NetBSD: PLIST,v 1.17 2013/04/21 14:46:34 wiz Exp $ bin/meld lib/meld/meld/__init__.py lib/meld/meld/__init__.pyc @@ -66,6 +66,9 @@ lib/meld/meld/recent.pyo lib/meld/meld/task.py lib/meld/meld/task.pyc lib/meld/meld/task.pyo +lib/meld/meld/test_matchers.py +lib/meld/meld/test_matchers.pyc +lib/meld/meld/test_matchers.pyo lib/meld/meld/tree.py lib/meld/meld/tree.pyc lib/meld/meld/tree.pyo diff --git a/devel/meld/distinfo b/devel/meld/distinfo index ec233ac1933..da56cbc9564 100644 --- a/devel/meld/distinfo +++ b/devel/meld/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.18 2013/03/15 22:00:58 wiz Exp $ +$NetBSD: distinfo,v 1.19 2013/04/21 14:46:34 wiz Exp $ -SHA1 (meld-1.7.1.tar.xz) = 904afbb911671cd7abb9fe394908704fe7ae723e -RMD160 (meld-1.7.1.tar.xz) = 818e9293c7aeda496fe73adcd7ee535bd1f24148 -Size (meld-1.7.1.tar.xz) = 374060 bytes +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 |