Sun Jul 28 09:23:20 2013 UTC ()
Update to 1.7.4:

2013-7-28 meld 1.7.4
====================

  Features:

    * Commit dialog can now automatically wrap commit messages (Kai Willadsen)
    * Add Bazaar support for pushing changes, and improve sensitivity setting
      (Louis des Landes)
    * Support Subversion 1.8 (Yuri)
    * Type-ahead-find search now works in folder comparisons (Kai Willadsen)
    * Preference to swap pane order left = local (Kai Willadsen)

    * Arch, Codeville and RCS are no longer supported (Kai Willadsen)

  Fixes:

    * When opening new tabs from the command line, bring new tab to the front
      (Richard Simmons)
    * Current chunk highlight is now customisable using gtkrc (Louis des
      Landes)
    * Syncpoints now prevent chunks from being re-merged, syncpoints move with
      insertions, and disable automatic updating (Kai Willadsen)
    * Various version control updates and fixes (Louis des Landes, Kai
      Willadsen)
    * Sensitivity fixes (Kai Willadsen)
    * Translation string fixes (Marek Černocký)

  Translations:
    * Daniel Mustieles (es)
    * Dimitris Spingos (el)
    * Fran Diéguez (gl)
    * Marek Černocký (cs)
    * Matej Urbančič (sl)
    * Piotr Drąg (pl)


(wiz)
diff -r1.38 -r1.39 pkgsrc/devel/meld/Makefile
diff -r1.18 -r1.19 pkgsrc/devel/meld/PLIST
diff -r1.20 -r1.21 pkgsrc/devel/meld/distinfo
cvs diff -r1.38 -r1.39 pkgsrc/devel/meld/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/meld/Makefile 2013/06/04 18:51:59 1.38
+++ pkgsrc/devel/meld/Makefile 2013/07/28 09:23:20 1.39
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.38 2013/06/04 18:51:59 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2013/07/28 09:23:20 wiz Exp $
2 2
3DISTNAME= meld-1.7.3 3DISTNAME= meld-1.7.4
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.7/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.7/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= dieter.NetBSD@pandora.be 8MAINTAINER= dieter.NetBSD@pandora.be
9HOMEPAGE= http://meldmerge.org/ 9HOMEPAGE= http://meldmerge.org/
10COMMENT= Visual diff and merge tool 10COMMENT= Visual diff and merge tool
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2 13DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2
14 14
15USE_PKGLOCALEDIR= YES 15USE_PKGLOCALEDIR= YES
16USE_TOOLS+= gmake msgfmt intltool 16USE_TOOLS+= gmake msgfmt intltool
cvs diff -r1.18 -r1.19 pkgsrc/devel/meld/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/meld/PLIST 2013/06/04 18:51:59 1.18
+++ pkgsrc/devel/meld/PLIST 2013/07/28 09:23:20 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.18 2013/06/04 18:51:59 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.19 2013/07/28 09:23:20 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
@@ -92,26 +92,29 @@ lib/meld/meld/ui/historyentry.pyc @@ -92,26 +92,29 @@ lib/meld/meld/ui/historyentry.pyc
92lib/meld/meld/ui/historyentry.pyo 92lib/meld/meld/ui/historyentry.pyo
93lib/meld/meld/ui/listwidget.py 93lib/meld/meld/ui/listwidget.py
94lib/meld/meld/ui/listwidget.pyc 94lib/meld/meld/ui/listwidget.pyc
95lib/meld/meld/ui/listwidget.pyo 95lib/meld/meld/ui/listwidget.pyo
96lib/meld/meld/ui/msgarea.py 96lib/meld/meld/ui/msgarea.py
97lib/meld/meld/ui/msgarea.pyc 97lib/meld/meld/ui/msgarea.pyc
98lib/meld/meld/ui/msgarea.pyo 98lib/meld/meld/ui/msgarea.pyo
99lib/meld/meld/ui/notebooklabel.py 99lib/meld/meld/ui/notebooklabel.py
100lib/meld/meld/ui/notebooklabel.pyc 100lib/meld/meld/ui/notebooklabel.pyc
101lib/meld/meld/ui/notebooklabel.pyo 101lib/meld/meld/ui/notebooklabel.pyo
102lib/meld/meld/ui/statusbar.py 102lib/meld/meld/ui/statusbar.py
103lib/meld/meld/ui/statusbar.pyc 103lib/meld/meld/ui/statusbar.pyc
104lib/meld/meld/ui/statusbar.pyo 104lib/meld/meld/ui/statusbar.pyo
 105lib/meld/meld/ui/vcdialogs.py
 106lib/meld/meld/ui/vcdialogs.pyc
 107lib/meld/meld/ui/vcdialogs.pyo
105lib/meld/meld/ui/wraplabel.py 108lib/meld/meld/ui/wraplabel.py
106lib/meld/meld/ui/wraplabel.pyc 109lib/meld/meld/ui/wraplabel.pyc
107lib/meld/meld/ui/wraplabel.pyo 110lib/meld/meld/ui/wraplabel.pyo
108lib/meld/meld/undo.py 111lib/meld/meld/undo.py
109lib/meld/meld/undo.pyc 112lib/meld/meld/undo.pyc
110lib/meld/meld/undo.pyo 113lib/meld/meld/undo.pyo
111lib/meld/meld/util/__init__.py 114lib/meld/meld/util/__init__.py
112lib/meld/meld/util/__init__.pyc 115lib/meld/meld/util/__init__.pyc
113lib/meld/meld/util/__init__.pyo 116lib/meld/meld/util/__init__.pyo
114lib/meld/meld/util/compat.py 117lib/meld/meld/util/compat.py
115lib/meld/meld/util/compat.pyc 118lib/meld/meld/util/compat.pyc
116lib/meld/meld/util/compat.pyo 119lib/meld/meld/util/compat.pyo
117lib/meld/meld/util/prefs.py 120lib/meld/meld/util/prefs.py
@@ -122,62 +125,53 @@ lib/meld/meld/util/sourceviewer.pyc @@ -122,62 +125,53 @@ lib/meld/meld/util/sourceviewer.pyc
122lib/meld/meld/util/sourceviewer.pyo 125lib/meld/meld/util/sourceviewer.pyo
123lib/meld/meld/vc/__init__.py 126lib/meld/meld/vc/__init__.py
124lib/meld/meld/vc/__init__.pyc 127lib/meld/meld/vc/__init__.pyc
125lib/meld/meld/vc/__init__.pyo 128lib/meld/meld/vc/__init__.pyo
126lib/meld/meld/vc/_null.py 129lib/meld/meld/vc/_null.py
127lib/meld/meld/vc/_null.pyc 130lib/meld/meld/vc/_null.pyc
128lib/meld/meld/vc/_null.pyo 131lib/meld/meld/vc/_null.pyo
129lib/meld/meld/vc/_vc.py 132lib/meld/meld/vc/_vc.py
130lib/meld/meld/vc/_vc.pyc 133lib/meld/meld/vc/_vc.pyc
131lib/meld/meld/vc/_vc.pyo 134lib/meld/meld/vc/_vc.pyo
132lib/meld/meld/vc/bzr.py 135lib/meld/meld/vc/bzr.py
133lib/meld/meld/vc/bzr.pyc 136lib/meld/meld/vc/bzr.pyc
134lib/meld/meld/vc/bzr.pyo 137lib/meld/meld/vc/bzr.pyo
135lib/meld/meld/vc/cdv.py 
136lib/meld/meld/vc/cdv.pyc 
137lib/meld/meld/vc/cdv.pyo 
138lib/meld/meld/vc/cvs.py 138lib/meld/meld/vc/cvs.py
139lib/meld/meld/vc/cvs.pyc 139lib/meld/meld/vc/cvs.pyc
140lib/meld/meld/vc/cvs.pyo 140lib/meld/meld/vc/cvs.pyo
141lib/meld/meld/vc/darcs.py 141lib/meld/meld/vc/darcs.py
142lib/meld/meld/vc/darcs.pyc 142lib/meld/meld/vc/darcs.pyc
143lib/meld/meld/vc/darcs.pyo 143lib/meld/meld/vc/darcs.pyo
144lib/meld/meld/vc/fossil.py 144lib/meld/meld/vc/fossil.py
145lib/meld/meld/vc/fossil.pyc 145lib/meld/meld/vc/fossil.pyc
146lib/meld/meld/vc/fossil.pyo 146lib/meld/meld/vc/fossil.pyo
147lib/meld/meld/vc/git.py 147lib/meld/meld/vc/git.py
148lib/meld/meld/vc/git.pyc 148lib/meld/meld/vc/git.pyc
149lib/meld/meld/vc/git.pyo 149lib/meld/meld/vc/git.pyo
150lib/meld/meld/vc/mercurial.py 150lib/meld/meld/vc/mercurial.py
151lib/meld/meld/vc/mercurial.pyc 151lib/meld/meld/vc/mercurial.pyc
152lib/meld/meld/vc/mercurial.pyo 152lib/meld/meld/vc/mercurial.pyo
153lib/meld/meld/vc/monotone.py 153lib/meld/meld/vc/monotone.py
154lib/meld/meld/vc/monotone.pyc 154lib/meld/meld/vc/monotone.pyc
155lib/meld/meld/vc/monotone.pyo 155lib/meld/meld/vc/monotone.pyo
156lib/meld/meld/vc/rcs.py 
157lib/meld/meld/vc/rcs.pyc 
158lib/meld/meld/vc/rcs.pyo 
159lib/meld/meld/vc/svk.py 156lib/meld/meld/vc/svk.py
160lib/meld/meld/vc/svk.pyc 157lib/meld/meld/vc/svk.pyc
161lib/meld/meld/vc/svk.pyo 158lib/meld/meld/vc/svk.pyo
162lib/meld/meld/vc/svn.py 159lib/meld/meld/vc/svn.py
163lib/meld/meld/vc/svn.pyc 160lib/meld/meld/vc/svn.pyc
164lib/meld/meld/vc/svn.pyo 161lib/meld/meld/vc/svn.pyo
165lib/meld/meld/vc/svn_17.py 162lib/meld/meld/vc/svn_17.py
166lib/meld/meld/vc/svn_17.pyc 163lib/meld/meld/vc/svn_17.pyc
167lib/meld/meld/vc/svn_17.pyo 164lib/meld/meld/vc/svn_17.pyo
168lib/meld/meld/vc/tla.py 
169lib/meld/meld/vc/tla.pyc 
170lib/meld/meld/vc/tla.pyo 
171lib/meld/meld/vcview.py 165lib/meld/meld/vcview.py
172lib/meld/meld/vcview.pyc 166lib/meld/meld/vcview.pyc
173lib/meld/meld/vcview.pyo 167lib/meld/meld/vcview.pyo
174share/applications/meld.desktop 168share/applications/meld.desktop
175share/gnome/help/meld/C/meld.xml 169share/gnome/help/meld/C/meld.xml
176share/gnome/help/meld/es/meld.xml 170share/gnome/help/meld/es/meld.xml
177share/gnome/help/meld/fr/meld.xml 171share/gnome/help/meld/fr/meld.xml
178share/icons/HighContrast/scalable/apps/meld.svg 172share/icons/HighContrast/scalable/apps/meld.svg
179share/icons/hicolor/16x16/apps/meld.png 173share/icons/hicolor/16x16/apps/meld.png
180share/icons/hicolor/22x22/apps/meld.png 174share/icons/hicolor/22x22/apps/meld.png
181share/icons/hicolor/32x32/apps/meld.png 175share/icons/hicolor/32x32/apps/meld.png
182share/icons/hicolor/48x48/apps/meld.png 176share/icons/hicolor/48x48/apps/meld.png
183share/icons/hicolor/scalable/apps/meld.svg 177share/icons/hicolor/scalable/apps/meld.svg
cvs diff -r1.20 -r1.21 pkgsrc/devel/meld/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/meld/distinfo 2013/06/04 18:51:59 1.20
+++ pkgsrc/devel/meld/distinfo 2013/07/28 09:23:20 1.21
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.20 2013/06/04 18:51:59 wiz Exp $ 1$NetBSD: distinfo,v 1.21 2013/07/28 09:23:20 wiz Exp $
2 2
3SHA1 (meld-1.7.3.tar.xz) = dc79d6a437a885fcd8dd98437ed074d2a122aa8a 3SHA1 (meld-1.7.4.tar.xz) = 84c4d26e1e10031db6a49e7d4c9cf454c24f6327
4RMD160 (meld-1.7.3.tar.xz) = 883d6deb04dab2f4150e9d23d83b387d79097115 4RMD160 (meld-1.7.4.tar.xz) = c80a4d16a57f7c7baafae32084100f5970c5bdf1
5Size (meld-1.7.3.tar.xz) = 398636 bytes 5Size (meld-1.7.4.tar.xz) = 406156 bytes