Sat Jul 12 14:34:37 2014 UTC ()
Update to 3.11.2:

2014-7-12 meld 3.11.2
=====================

  Features:

   * File and folder comparison panes can now be resized (Marco Brito)
   * Folder comparisons now support scrolling between chunks using the mouse
     wheel in the link map, like file comparisons (Kai Willadsen)

  Fixes:

   * Don't draw spurious actions for equal chunks (Kai Willadsen)
   * Remove default sourceview behaviour for Alt+Left/Right (Kai Willadsen)
   * Fix storing translated column names in configuration (Kai Willadsen)
   * Several fixes for multiple windows in single-instance handling:
     * Resolve relative paths relative to the correct instance (Kai Willadsen)
     * Don't create windows in the original instance when the calling instance
       errors out (Kai Willadsen)
     * Raise the correct window for new windows in the same instance (Kai
       Willadsen)
     * Exit correctly for command line errors in the calling instance (Kai
       Willadsen)
   * Fix display of unicode paths in repositories (Kai Willadsen)
   * Fix handling of unicode paths in recent files store (Kai Willadsen)
   * Improve behaviour of Open External action, and handle spaces in filenames
     for the custom editor option (Kai Willadsen)
   * Improve support custom installation prefixes (Kai Willadsen)

  Translations:

   * Benjamin Steinwender (de)
   * Daniel Mustieles (es)
   * Lasse Liehu (fi)
   * Marek Černocký (cs)
   * Matej Urbančič (sl)
   * Piotr Drąg (pl)
   * Rafael Ferreira (pt_BR)
   * Yuri Myasoedov (ru)


(wiz)
diff -r1.5 -r1.6 pkgsrc/devel/meld-devel/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/meld-devel/PLIST
diff -r1.2 -r1.3 pkgsrc/devel/meld-devel/distinfo
cvs diff -r1.5 -r1.6 pkgsrc/devel/meld-devel/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/meld-devel/Attic/Makefile 2014/05/27 18:10:52 1.5
+++ pkgsrc/devel/meld-devel/Attic/Makefile 2014/07/12 14:34:37 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.5 2014/05/27 18:10:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2014/07/12 14:34:37 wiz Exp $
2 2
3DISTNAME= meld-3.11.1 3DISTNAME= meld-3.11.2
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.11/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.11/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= wiz@NetBSD.org 8MAINTAINER= wiz@NetBSD.org
9HOMEPAGE= http://meldmerge.org/ 9HOMEPAGE= http://meldmerge.org/
10COMMENT= Visual diff and merge tool (GTK3 version) 10COMMENT= Visual diff and merge tool (GTK3 version)
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool 13BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool
14DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3 14DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3
15DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas 15DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas
16 16
cvs diff -r1.2 -r1.3 pkgsrc/devel/meld-devel/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/meld-devel/Attic/PLIST 2014/05/27 18:10:52 1.2
+++ pkgsrc/devel/meld-devel/Attic/PLIST 2014/07/12 14:34:37 1.3
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1@comment $NetBSD: PLIST,v 1.2 2014/05/27 18:10:52 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2014/07/12 14:34:37 wiz Exp $
2bin/meld 2bin/meld
3${PYSITELIB}/${EGG_FILE} 3${PYSITELIB}/${EGG_FILE}
4${PYSITELIB}/meld/__init__.py 4${PYSITELIB}/meld/__init__.py
5${PYSITELIB}/meld/__init__.pyc 5${PYSITELIB}/meld/__init__.pyc
6${PYSITELIB}/meld/__init__.pyo 6${PYSITELIB}/meld/__init__.pyo
7${PYSITELIB}/meld/build_helpers.py 7${PYSITELIB}/meld/build_helpers.py
8${PYSITELIB}/meld/build_helpers.pyc 8${PYSITELIB}/meld/build_helpers.pyc
9${PYSITELIB}/meld/build_helpers.pyo 9${PYSITELIB}/meld/build_helpers.pyo
10${PYSITELIB}/meld/conf.py 10${PYSITELIB}/meld/conf.py
11${PYSITELIB}/meld/conf.pyc 11${PYSITELIB}/meld/conf.pyc
12${PYSITELIB}/meld/conf.pyo 12${PYSITELIB}/meld/conf.pyo
13${PYSITELIB}/meld/const.py 13${PYSITELIB}/meld/const.py
14${PYSITELIB}/meld/const.pyc 14${PYSITELIB}/meld/const.pyc
15${PYSITELIB}/meld/const.pyo 15${PYSITELIB}/meld/const.pyo
 16${PYSITELIB}/meld/diffgrid.py
 17${PYSITELIB}/meld/diffgrid.pyc
 18${PYSITELIB}/meld/diffgrid.pyo
16${PYSITELIB}/meld/diffmap.py 19${PYSITELIB}/meld/diffmap.py
17${PYSITELIB}/meld/diffmap.pyc 20${PYSITELIB}/meld/diffmap.pyc
18${PYSITELIB}/meld/diffmap.pyo 21${PYSITELIB}/meld/diffmap.pyo
19${PYSITELIB}/meld/diffutil.py 22${PYSITELIB}/meld/diffutil.py
20${PYSITELIB}/meld/diffutil.pyc 23${PYSITELIB}/meld/diffutil.pyc
21${PYSITELIB}/meld/diffutil.pyo 24${PYSITELIB}/meld/diffutil.pyo
22${PYSITELIB}/meld/dirdiff.py 25${PYSITELIB}/meld/dirdiff.py
23${PYSITELIB}/meld/dirdiff.pyc 26${PYSITELIB}/meld/dirdiff.pyc
24${PYSITELIB}/meld/dirdiff.pyo 27${PYSITELIB}/meld/dirdiff.pyo
25${PYSITELIB}/meld/filediff.py 28${PYSITELIB}/meld/filediff.py
26${PYSITELIB}/meld/filediff.pyc 29${PYSITELIB}/meld/filediff.pyc
27${PYSITELIB}/meld/filediff.pyo 30${PYSITELIB}/meld/filediff.pyo
28${PYSITELIB}/meld/filemerge.py 31${PYSITELIB}/meld/filemerge.py
cvs diff -r1.2 -r1.3 pkgsrc/devel/meld-devel/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/meld-devel/Attic/distinfo 2014/05/27 18:10:53 1.2
+++ pkgsrc/devel/meld-devel/Attic/distinfo 2014/07/12 14:34:37 1.3
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.2 2014/05/27 18:10:53 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2014/07/12 14:34:37 wiz Exp $
2 2
3SHA1 (meld-3.11.1.tar.xz) = d7a641bcb67dbae5087708bfe256a8385f015e13 3SHA1 (meld-3.11.2.tar.xz) = 9d2dfe0579241ff8f4e9681945fb9cd229947edc
4RMD160 (meld-3.11.1.tar.xz) = 3063f24c59411a572abaefd4af44493f5a05f758 4RMD160 (meld-3.11.2.tar.xz) = 4d0769c716dd7946259e7d36a5e3bc5a3e4a3a79
5Size (meld-3.11.1.tar.xz) = 437704 bytes 5Size (meld-3.11.2.tar.xz) = 441656 bytes