Thu Aug 20 09:06:40 2009 UTC ()
Update to 0.4.0:

Diffuse 0.4.0 - 2009-08-17
- changed the default hotkeys for merging to reflect the direction text "moves"
- added format menu with new items for changing case, sorting, and manipulating white space
- replaced 'Hide end of line characters' preference with 'Show white space characters'
- errors are now reported in a dialogue instead of printing to stderr
- optimised redraws when only the cursor position has changed
- input methods that use pre-editing can now be used when editing text
- dead keys can now be used when editing text
- updated Monotone support to use 'mtn automate inventory'
- Git support now handles files flagged as 'unmerged'
- graceful handling of and non-zero exit codes from 'git status'
- added version control section to the manual
- minor bug fixes


(wiz)
diff -r1.13 -r1.14 pkgsrc/devel/diffuse/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/diffuse/PLIST
diff -r1.5 -r1.6 pkgsrc/devel/diffuse/distinfo
diff -r1.4 -r0 pkgsrc/devel/diffuse/patches/patch-aa

cvs diff -r1.13 -r1.14 pkgsrc/devel/diffuse/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/diffuse/Makefile 2009/08/17 18:33:22 1.13
+++ pkgsrc/devel/diffuse/Makefile 2009/08/20 09:06:40 1.14
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.13 2009/08/17 18:33:22 hasso Exp $ 1# $NetBSD: Makefile,v 1.14 2009/08/20 09:06:40 wiz Exp $
2# 2#
3 3
4DISTNAME= diffuse-0.3.4 4DISTNAME= diffuse-0.4.0
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=diffuse/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=diffuse/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://diffuse.sourceforge.net/ 10HOMEPAGE= http://diffuse.sourceforge.net/
11COMMENT= Graphical tool for merging and comparing text files 11COMMENT= Graphical tool for merging and comparing text files
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16USE_TOOLS+= msgfmt 16USE_TOOLS+= msgfmt
17USE_LANGUAGES= # none 17USE_LANGUAGES= # none

cvs diff -r1.5 -r1.6 pkgsrc/devel/diffuse/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/diffuse/PLIST 2009/08/06 21:52:07 1.5
+++ pkgsrc/devel/diffuse/PLIST 2009/08/20 09:06:40 1.6
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1@comment $NetBSD: PLIST,v 1.5 2009/08/06 21:52:07 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2009/08/20 09:06:40 wiz Exp $
2bin/diffuse 2bin/diffuse
3man/man1/diffuse.1 3man/man1/diffuse.1
4share/applications/diffuse.desktop 4share/applications/diffuse.desktop
5share/diffuse/syntax/bash.syntax 5share/diffuse/syntax/bash.syntax
6share/diffuse/syntax/c++.syntax 6share/diffuse/syntax/c++.syntax
7share/diffuse/syntax/csh.syntax 7share/diffuse/syntax/csh.syntax
8share/diffuse/syntax/csharp.syntax 8share/diffuse/syntax/csharp.syntax
9share/diffuse/syntax/css.syntax 9share/diffuse/syntax/css.syntax
 10share/diffuse/syntax/fortran.syntax
10share/diffuse/syntax/gettext.syntax 11share/diffuse/syntax/gettext.syntax
11share/diffuse/syntax/glsl.syntax 12share/diffuse/syntax/glsl.syntax
12share/diffuse/syntax/html.syntax 13share/diffuse/syntax/html.syntax
13share/diffuse/syntax/ini.syntax 14share/diffuse/syntax/ini.syntax
14share/diffuse/syntax/java.syntax 15share/diffuse/syntax/java.syntax
15share/diffuse/syntax/javascript.syntax 16share/diffuse/syntax/javascript.syntax
16share/diffuse/syntax/jsp.syntax 17share/diffuse/syntax/jsp.syntax
17share/diffuse/syntax/makefile.syntax 18share/diffuse/syntax/makefile.syntax
18share/diffuse/syntax/objective-c++.syntax 19share/diffuse/syntax/objective-c++.syntax
19share/diffuse/syntax/octave.syntax 20share/diffuse/syntax/octave.syntax
20share/diffuse/syntax/pascal.syntax 21share/diffuse/syntax/pascal.syntax
21share/diffuse/syntax/patch.syntax 22share/diffuse/syntax/patch.syntax
22share/diffuse/syntax/perl.syntax 23share/diffuse/syntax/perl.syntax

cvs diff -r1.5 -r1.6 pkgsrc/devel/diffuse/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/diffuse/distinfo 2009/08/06 21:52:07 1.5
+++ pkgsrc/devel/diffuse/distinfo 2009/08/20 09:06:40 1.6
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
1$NetBSD: distinfo,v 1.5 2009/08/06 21:52:07 wiz Exp $ 1$NetBSD: distinfo,v 1.6 2009/08/20 09:06:40 wiz Exp $
2 2
3SHA1 (diffuse-0.3.4.tar.bz2) = f221d248b44d978fc031cb739e382d9058ca4efc 3SHA1 (diffuse-0.4.0.tar.bz2) = d143c5415c71ac07e9b57ff8b3b79f196bf810ca
4RMD160 (diffuse-0.3.4.tar.bz2) = 54f8ffaed9bc2153e1ed3acb64a3e9fd000ee2a1 4RMD160 (diffuse-0.4.0.tar.bz2) = 91cd8f13e40eb25bccab57c47ea3311e53ed38d9
5Size (diffuse-0.3.4.tar.bz2) = 102845 bytes 5Size (diffuse-0.4.0.tar.bz2) = 109438 bytes
6SHA1 (patch-aa) = d314791a740b878af9041c70920562fa6385708d 

File Deleted: pkgsrc/devel/diffuse/patches/Attic/patch-aa