Fri Jul 18 09:43:57 2008 UTC ()
Update to 1.2:

2008-06-26 meld-1.2
=======================

	* Improve tab rendering (Kai Willadsen)

	* Speedup folder comparison massively for large directories.

	* Fix crasher i18n bug (Kai Willadsen)

	* UI tweaks and cleanups (Tom Baugis, Kai Willadsen)

	* Cleanup vc library redundancy (Vincent Legoll)

	* Various version control fixes.


(wiz)
diff -r1.9 -r1.10 pkgsrc/devel/meld/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/meld/PLIST
diff -r1.2 -r1.3 pkgsrc/devel/meld/distinfo
diff -r0 -r1.1 pkgsrc/devel/meld/patches/patch-aa
cvs diff -r1.9 -r1.10 pkgsrc/devel/meld/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/meld/Makefile 2008/07/14 12:56:02 1.9
+++ pkgsrc/devel/meld/Makefile 2008/07/18 09:43:57 1.10
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.9 2008/07/14 12:56:02 joerg Exp $ 1# $NetBSD: Makefile,v 1.10 2008/07/18 09:43:57 wiz Exp $
2# 2#
3 3
4DISTNAME= meld-1.1.5.1 4DISTNAME= meld-1.2
5PKGREVISION= 1 
6CATEGORIES= devel 5CATEGORIES= devel
7MASTER_SITES= http://ftp.gnome.org/pub/gnome/sources/meld/1.1/ 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.2/}
8EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
9 8
10PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
11 10
12DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.6.0:../../x11/py-gtk2 11DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.6.0:../../x11/py-gtk2
13DEPENDS+= ${PYPKGPREFIX}-gnome2>=2.6.0:../../x11/py-gnome2 12DEPENDS+= ${PYPKGPREFIX}-gnome2>=2.6.0:../../x11/py-gnome2
14 13
15MAINTAINER= dieter.NetBSD@pandora.be 14MAINTAINER= dieter.NetBSD@pandora.be
16HOMEPAGE= http://meld.sourceforge.net/ 15HOMEPAGE= http://meld.sourceforge.net/
17COMMENT= Visual diff and merge tool 16COMMENT= Visual diff and merge tool
18 17
19USE_DIRS+= xdg-1.3 18USE_DIRS+= xdg-1.3
20USE_DIRS+= gnome2-1.6 19USE_DIRS+= gnome2-1.6
cvs diff -r1.3 -r1.4 pkgsrc/devel/meld/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/meld/PLIST 2007/11/03 13:22:43 1.3
+++ pkgsrc/devel/meld/PLIST 2008/07/18 09:43:57 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2007/11/03 13:22:43 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.4 2008/07/18 09:43:57 wiz Exp $
2bin/meld 2bin/meld
3lib/meld/diffutil.py 3lib/meld/diffutil.py
4lib/meld/diffutil.pyc 4lib/meld/diffutil.pyc
5lib/meld/diffutil.pyo 5lib/meld/diffutil.pyo
6lib/meld/dirdiff.py 6lib/meld/dirdiff.py
7lib/meld/dirdiff.pyc 7lib/meld/dirdiff.pyc
8lib/meld/dirdiff.pyo 8lib/meld/dirdiff.pyo
9lib/meld/filediff.py 9lib/meld/filediff.py
10lib/meld/filediff.pyc 10lib/meld/filediff.pyc
11lib/meld/filediff.pyo 11lib/meld/filediff.pyo
12lib/meld/gnomeglade.py 12lib/meld/gnomeglade.py
13lib/meld/gnomeglade.pyc 13lib/meld/gnomeglade.pyc
14lib/meld/gnomeglade.pyo 14lib/meld/gnomeglade.pyo
@@ -44,60 +44,65 @@ lib/meld/vc/_null.pyc @@ -44,60 +44,65 @@ lib/meld/vc/_null.pyc
44lib/meld/vc/_null.pyo 44lib/meld/vc/_null.pyo
45lib/meld/vc/_vc.py 45lib/meld/vc/_vc.py
46lib/meld/vc/_vc.pyc 46lib/meld/vc/_vc.pyc
47lib/meld/vc/_vc.pyo 47lib/meld/vc/_vc.pyo
48lib/meld/vc/bzr.py 48lib/meld/vc/bzr.py
49lib/meld/vc/bzr.pyc 49lib/meld/vc/bzr.pyc
50lib/meld/vc/bzr.pyo 50lib/meld/vc/bzr.pyo
51lib/meld/vc/cvs.py 51lib/meld/vc/cvs.py
52lib/meld/vc/cvs.pyc 52lib/meld/vc/cvs.pyc
53lib/meld/vc/cvs.pyo 53lib/meld/vc/cvs.pyo
54lib/meld/vc/darcs.py 54lib/meld/vc/darcs.py
55lib/meld/vc/darcs.pyc 55lib/meld/vc/darcs.pyc
56lib/meld/vc/darcs.pyo 56lib/meld/vc/darcs.pyo
 57lib/meld/vc/git.py
 58lib/meld/vc/git.pyc
 59lib/meld/vc/git.pyo
57lib/meld/vc/mercurial.py 60lib/meld/vc/mercurial.py
58lib/meld/vc/mercurial.pyc 61lib/meld/vc/mercurial.pyc
59lib/meld/vc/mercurial.pyo 62lib/meld/vc/mercurial.pyo
60lib/meld/vc/monotone.py 63lib/meld/vc/monotone.py
61lib/meld/vc/monotone.pyc 64lib/meld/vc/monotone.pyc
62lib/meld/vc/monotone.pyo 65lib/meld/vc/monotone.pyo
63lib/meld/vc/svn.py 66lib/meld/vc/svn.py
64lib/meld/vc/svn.pyc 67lib/meld/vc/svn.pyc
65lib/meld/vc/svn.pyo 68lib/meld/vc/svn.pyo
66lib/meld/vc/tla.py 69lib/meld/vc/tla.py
67lib/meld/vc/tla.pyc 70lib/meld/vc/tla.pyc
68lib/meld/vc/tla.pyo 71lib/meld/vc/tla.pyo
69lib/meld/vcview.py 72lib/meld/vcview.py
70lib/meld/vcview.pyc 73lib/meld/vcview.pyc
71lib/meld/vcview.pyo 74lib/meld/vcview.pyo
72share/application-registry/meld.applications 75share/application-registry/meld.applications
73share/applications/meld.desktop 76share/applications/meld.desktop
74share/ar/LC_MESSAGES/meld.mo 77share/ar/LC_MESSAGES/meld.mo
75share/bg/LC_MESSAGES/meld.mo 78share/bg/LC_MESSAGES/meld.mo
76share/ca/LC_MESSAGES/meld.mo 79share/ca/LC_MESSAGES/meld.mo
77share/cs/LC_MESSAGES/meld.mo 80share/cs/LC_MESSAGES/meld.mo
78share/de/LC_MESSAGES/meld.mo 81share/de/LC_MESSAGES/meld.mo
79share/dz/LC_MESSAGES/meld.mo 82share/dz/LC_MESSAGES/meld.mo
 83share/el/LC_MESSAGES/meld.mo
80share/en_CA/LC_MESSAGES/meld.mo 84share/en_CA/LC_MESSAGES/meld.mo
81share/en_GB/LC_MESSAGES/meld.mo 85share/en_GB/LC_MESSAGES/meld.mo
82share/es/LC_MESSAGES/meld.mo 86share/es/LC_MESSAGES/meld.mo
83share/fi/LC_MESSAGES/meld.mo 87share/fi/LC_MESSAGES/meld.mo
84share/fr/LC_MESSAGES/meld.mo 88share/fr/LC_MESSAGES/meld.mo
85share/gnome/help/meld/C/figures/dirdiff.png 89share/gnome/help/meld/C/figures/dirdiff.png
86share/gnome/help/meld/C/figures/filediff.png 90share/gnome/help/meld/C/figures/filediff.png
87share/gnome/help/meld/C/meld.xml 91share/gnome/help/meld/C/meld.xml
88share/gnome/help/meld/es/figures/dirdiff.png 92share/gnome/help/meld/es/figures/dirdiff.png
89share/gnome/help/meld/es/figures/filediff.png 93share/gnome/help/meld/es/figures/filediff.png
90share/gnome/help/meld/es/meld.xml 94share/gnome/help/meld/es/meld.xml
 95share/gnome/help/meld/fr/meld.xml
91share/hu/LC_MESSAGES/meld.mo 96share/hu/LC_MESSAGES/meld.mo
92share/it/LC_MESSAGES/meld.mo 97share/it/LC_MESSAGES/meld.mo
93share/ja/LC_MESSAGES/meld.mo 98share/ja/LC_MESSAGES/meld.mo
94share/ko/LC_MESSAGES/meld.mo 99share/ko/LC_MESSAGES/meld.mo
95share/meld/glade2/dirdiff.glade 100share/meld/glade2/dirdiff.glade
96share/meld/glade2/filediff.glade 101share/meld/glade2/filediff.glade
97share/meld/glade2/meldapp.glade 102share/meld/glade2/meldapp.glade
98share/meld/glade2/pixmaps/button_apply0.xpm 103share/meld/glade2/pixmaps/button_apply0.xpm
99share/meld/glade2/pixmaps/button_apply1.xpm 104share/meld/glade2/pixmaps/button_apply1.xpm
100share/meld/glade2/pixmaps/button_copy0.xpm 105share/meld/glade2/pixmaps/button_copy0.xpm
101share/meld/glade2/pixmaps/button_copy1.xpm 106share/meld/glade2/pixmaps/button_copy1.xpm
102share/meld/glade2/pixmaps/button_delete.xpm 107share/meld/glade2/pixmaps/button_delete.xpm
103share/meld/glade2/pixmaps/close.xpm 108share/meld/glade2/pixmaps/close.xpm
@@ -116,28 +121,30 @@ share/meld/glade2/pixmaps/tree-file-newe @@ -116,28 +121,30 @@ share/meld/glade2/pixmaps/tree-file-newe
116share/meld/glade2/pixmaps/tree-file-normal.png 121share/meld/glade2/pixmaps/tree-file-normal.png
117share/meld/glade2/pixmaps/tree-folder-changed.png 122share/meld/glade2/pixmaps/tree-folder-changed.png
118share/meld/glade2/pixmaps/tree-folder-new.png 123share/meld/glade2/pixmaps/tree-folder-new.png
119share/meld/glade2/pixmaps/tree-folder-normal.png 124share/meld/glade2/pixmaps/tree-folder-normal.png
120share/meld/glade2/pixmaps/vc-add-24.png 125share/meld/glade2/pixmaps/vc-add-24.png
121share/meld/glade2/pixmaps/vc-checkout-24.png 126share/meld/glade2/pixmaps/vc-checkout-24.png
122share/meld/glade2/pixmaps/vc-commit-24.png 127share/meld/glade2/pixmaps/vc-commit-24.png
123share/meld/glade2/pixmaps/vc-icon.png 128share/meld/glade2/pixmaps/vc-icon.png
124share/meld/glade2/pixmaps/vc-remove-24.png 129share/meld/glade2/pixmaps/vc-remove-24.png
125share/meld/glade2/pixmaps/vc-update-24.png 130share/meld/glade2/pixmaps/vc-update-24.png
126share/meld/glade2/vcview.glade 131share/meld/glade2/vcview.glade
127share/ne/LC_MESSAGES/meld.mo 132share/ne/LC_MESSAGES/meld.mo
128share/nl/LC_MESSAGES/meld.mo 133share/nl/LC_MESSAGES/meld.mo
 134share/oc/LC_MESSAGES/meld.mo
129share/omf/meld/meld-C.omf 135share/omf/meld/meld-C.omf
130share/omf/meld/meld-es.omf 136share/omf/meld/meld-es.omf
 137share/omf/meld/meld-fr.omf
131share/pa/LC_MESSAGES/meld.mo 138share/pa/LC_MESSAGES/meld.mo
132share/pixmaps/meld.png 139share/pixmaps/meld.png
133share/pt/LC_MESSAGES/meld.mo 140share/pt/LC_MESSAGES/meld.mo
134share/pt_BR/LC_MESSAGES/meld.mo 141share/pt_BR/LC_MESSAGES/meld.mo
135share/ru/LC_MESSAGES/meld.mo 142share/ru/LC_MESSAGES/meld.mo
136share/rw/LC_MESSAGES/meld.mo 143share/rw/LC_MESSAGES/meld.mo
137share/sr/LC_MESSAGES/meld.mo 144share/sr/LC_MESSAGES/meld.mo
138share/sr@Latn/LC_MESSAGES/meld.mo 145share/sr@Latn/LC_MESSAGES/meld.mo
139share/sv/LC_MESSAGES/meld.mo 146share/sv/LC_MESSAGES/meld.mo
140share/vi/LC_MESSAGES/meld.mo 147share/vi/LC_MESSAGES/meld.mo
141share/zh_CN/LC_MESSAGES/meld.mo 148share/zh_CN/LC_MESSAGES/meld.mo
142share/zh_TW/LC_MESSAGES/meld.mo 149share/zh_TW/LC_MESSAGES/meld.mo
143@dirrm share/zh_TW/LC_MESSAGES 150@dirrm share/zh_TW/LC_MESSAGES
@@ -170,26 +177,27 @@ share/zh_TW/LC_MESSAGES/meld.mo @@ -170,26 +177,27 @@ share/zh_TW/LC_MESSAGES/meld.mo
170@dirrm share/ne/LC_MESSAGES 177@dirrm share/ne/LC_MESSAGES
171@dirrm share/ne 178@dirrm share/ne
172@dirrm share/meld/glade2/pixmaps 179@dirrm share/meld/glade2/pixmaps
173@dirrm share/meld/glade2 180@dirrm share/meld/glade2
174@dirrm share/meld 181@dirrm share/meld
175@dirrm share/ko/LC_MESSAGES 182@dirrm share/ko/LC_MESSAGES
176@dirrm share/ko 183@dirrm share/ko
177@dirrm share/ja/LC_MESSAGES 184@dirrm share/ja/LC_MESSAGES
178@dirrm share/ja 185@dirrm share/ja
179@dirrm share/it/LC_MESSAGES 186@dirrm share/it/LC_MESSAGES
180@dirrm share/it 187@dirrm share/it
181@dirrm share/hu/LC_MESSAGES 188@dirrm share/hu/LC_MESSAGES
182@dirrm share/hu 189@dirrm share/hu
 190@dirrm share/gnome/help/meld/fr
183@dirrm share/gnome/help/meld/es/figures 191@dirrm share/gnome/help/meld/es/figures
184@dirrm share/gnome/help/meld/es 192@dirrm share/gnome/help/meld/es
185@dirrm share/gnome/help/meld/C/figures 193@dirrm share/gnome/help/meld/C/figures
186@dirrm share/gnome/help/meld/C 194@dirrm share/gnome/help/meld/C
187@dirrm share/gnome/help/meld 195@dirrm share/gnome/help/meld
188@comment in gnome2-dirs: @dirrm share/gnome/help 196@comment in gnome2-dirs: @dirrm share/gnome/help
189@dirrm share/fr/LC_MESSAGES 197@dirrm share/fr/LC_MESSAGES
190@dirrm share/fr 198@dirrm share/fr
191@dirrm share/fi/LC_MESSAGES 199@dirrm share/fi/LC_MESSAGES
192@dirrm share/fi 200@dirrm share/fi
193@dirrm share/es/LC_MESSAGES 201@dirrm share/es/LC_MESSAGES
194@dirrm share/es 202@dirrm share/es
195@dirrm share/en_GB/LC_MESSAGES 203@dirrm share/en_GB/LC_MESSAGES
cvs diff -r1.2 -r1.3 pkgsrc/devel/meld/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/meld/distinfo 2007/06/16 02:35:08 1.2
+++ pkgsrc/devel/meld/distinfo 2008/07/18 09:43:57 1.3
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.2 2007/06/16 02:35:08 obache Exp $ 1$NetBSD: distinfo,v 1.3 2008/07/18 09:43:57 wiz Exp $
2 2
3SHA1 (meld-1.1.5.1.tar.bz2) = 047bc68184ed18d490bc41658c7d2d3d8950696a 3SHA1 (meld-1.2.tar.bz2) = aa246307226332b865216d139c10de4c73562fc1
4RMD160 (meld-1.1.5.1.tar.bz2) = 8ac6e0b6518388f188ab6a0f13ace67aad02fef4 4RMD160 (meld-1.2.tar.bz2) = a06fee2f8f882a1edba329bd0be7797f89852920
5Size (meld-1.1.5.1.tar.bz2) = 602859 bytes 5Size (meld-1.2.tar.bz2) = 616975 bytes
 6SHA1 (patch-aa) = 6028b73c128ae38c34b1009a1a13de53d0ff61d6
File Added: pkgsrc/devel/meld/patches/Attic/patch-aa
$NetBSD: patch-aa,v 1.1 2008/07/18 09:43:57 wiz Exp $

--- help/fr/GNUmakefile.orig	2008-03-31 20:44:53.000000000 +0000
+++ help/fr/GNUmakefile
@@ -15,9 +15,7 @@ all $(OMF_NAME).install : $(OMF_NAME)
 
 .PHONY : install
 install : $(OMF_NAME).install
-	-mkdir -m 755 -p $(OMF_DIR_) $(XML_DIR_) $(XML_DIR_)/figures
 	install -m 644 meld.$(LANG).xml $(XML_DIR_)/meld.xml
-	install -m 644 figures/*.png $(XML_DIR_)/figures
 	-install -m 644 $< $(OMF_DIR_)/$(OMF_NAME)
 	-scrollkeeper-update -p $(OMF_STATE) -o $(OMF_DIR_)