b340602987
2011-3-20 meld 1.5.1
=====================
New features:
* Add menu items and keyboard shortcuts for version control and directory
comparison actions (Kai Willadsen)
* Add support for the Fossil SCM (Jan Danielsson)
* Add a menu for switching between tabs (Kai Willadsen)
* Add a menu item to unlock scrolling (Kai Willadsen)
Code changes and fixes:
* Improve filter handling with inline error reporting in the preference
pane, and correct refreshing of file and directory comparisons on filter
changes (Kai Willadsen)
* Make line number display work with GtkSourceView 2.10+ (Piotr Piastucki)
* Support external diff tools in subversion (Cedric Le Dillau)
* Support CVSNT as a CVS alternative (Kai Willadsen)
* Performance fixes for subversion and bazaar (Tristan Hill, Kirill Müller)
* Correctly update a modified file's status in git and svn version control
views (Peter Tyser)
* Make temporary files unwritable to avoid unintentionally editing them
(Peter Tyser)
* Clean up diff results for cleaner comparisons (Piotr Piastucki)
* Improve symlink and binary handling, and error cases for directory
comparisons (Kai Willadsen)
* Improve copy semantics for directories and symlinks (Kai Willadsen)
* Show case insensitivity and file encoding errors less intrusively (Kai
Willadsen)
* Sundry bug fixes (Kai Willadsen, Piotr Piastucki)
Translation updates:
* Bruno Brouard (fr)
* Claude Paroz (fr)
* Daniel Mustieles (es)
* Joe Hansen (da)
* Mario Blättermann (de)
* Matej Urbančič (sl)
* Miroslav Nikolić (sr)
* Petr Kovar (cs)
* Takeshi AIHANA (ja)
2010-12-27 meld 1.5.0
=====================
New features:
* Use MyersSequenceMatcher by default (matcher from Piotr Piastucki)
* Add a "Show whitespace" preference (Jon Dufresne)
* Add "Copy change above/below left/right" actions (Kai Willadsen)
* Add Alt+Up/Down as shortcuts for previous/next change (Kai Willadsen)
* Add previous/next conflict actions (Kai Willadsen)
* Patch creation can now create reverse patches, and can choose between
panes in a three-way comparison (Kai Willadsen)
* Add a --output option for specifying where to save a merge result
(Kai Willadsen)
Code changes and fixes:
* Require Python 2.5, Gtk+/PyGtk 2.14, PyGtkSourceView 2.4 (optional)
* Port to gtk.Builder and gtk.IconTheme (Kai Willadsen)
* Remove gnome-vfs usage (Kai Willadsen)
* Portability fixes (Thomas Klausner)
* Build fixes (Helmut Jarausch)
* Add a man page (Peter Tyser)
* Put preferences fallback in XDG-compliant location (Kai Willadsen)
* Fix Undo/Redo with unicode text (Kai Willadsen)
* Handle unicode linebreaks (Kai Willadsen)
Translation updates:
* Bruno Brouard (fr)
* Carles Ferrando (ca@valencia)
* Claude Paroz (fr)
* Gabor Kelemen (hu)
* Joe Hansen (da)
* Jorge González (es)
* Mario Blättermann (de)
* Matej Urbančič (sl)
* Petr Kovar (cs)
35 lines
981 B
Makefile
35 lines
981 B
Makefile
# $NetBSD: Makefile,v 1.27 2011/04/05 13:08:34 wiz Exp $
|
|
#
|
|
|
|
DISTNAME= meld-1.5.1
|
|
CATEGORIES= devel
|
|
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.5/}
|
|
EXTRACT_SUFX= .tar.bz2
|
|
|
|
MAINTAINER= dieter.NetBSD@pandora.be
|
|
HOMEPAGE= http://meld.sourceforge.net/
|
|
COMMENT= Visual diff and merge tool
|
|
LICENSE= gnu-gpl-v2
|
|
|
|
DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2
|
|
|
|
PKG_DESTDIR_SUPPORT= user-destdir
|
|
|
|
PYTHON_VERSIONS_INCOMPATIBLE= 24
|
|
|
|
USE_PKGLOCALEDIR= YES
|
|
USE_TOOLS+= gmake msgfmt intltool
|
|
MAKE_FLAGS+= prefix=${PREFIX}
|
|
MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale
|
|
MAKE_FLAGS+= PYTHON=${PYTHONBIN}
|
|
PYTHON_PATCH_SCRIPTS= bin/meld
|
|
|
|
# remove unnecessarily created empty dirs
|
|
post-install:
|
|
${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld
|
|
${RMDIR} ${DESTDIR}${PREFIX}/share/pixmaps
|
|
|
|
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
|
|
.include "../../lang/python/application.mk"
|
|
.include "../../mk/omf-scrollkeeper.mk"
|
|
.include "../../mk/bsd.pkg.mk"
|