From fe274d84b860d7d2125bea45c23298b48a0e5cfd Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 1 Oct 2014 09:43:43 +0000 Subject: Update to 3.12.0, based on meld-devel with an update. Changes to meld-devel: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2014-09-27 meld 3.12.0 ====================== Fixes: * Ignore missing files when cleaning up our recently-used folder (Kai Willadsen) * Guard against dialogs missing properties they should definitely have (Kai Willadsen) * Remove old property from patch dialog (Kai Willadsen) Translations: * Andika Triwidada (id) * Marek Černocký (cs) * Piotr Drąg (pl) 2014-09-19 meld 3.11.4 ====================== Fixes: * Only apply the auto merge flag to the last comparison started (Kai Willadsen) * Fix install layout issues on Debian-based systems (Kai Willadsen) * Fix "Open External" for files on Windows (Kai Willadsen) * Record installation directory and executable location on Windows (Kai Willadsen) * Revert to using latin1 as a fallback encoding; this will be reverted in the next unstable series (Kai Willadsen) Translations: * Andika Triwidada (id) * Daniel Mustieles (es) * fr33domlover (he) * Jiri Grönroos (fi) * Josef Andersson (sv) * Marek Černocký (cs) * Piotr Drąg (pl) --- devel/meld/DESCR | 2 +- devel/meld/Makefile | 42 ++--- devel/meld/PLIST | 441 ++++++++++++++++++++++++++++++---------------------- devel/meld/distinfo | 8 +- 4 files changed, 287 insertions(+), 206 deletions(-) diff --git a/devel/meld/DESCR b/devel/meld/DESCR index 19e762ce8e8..a538020c78e 100644 --- a/devel/meld/DESCR +++ b/devel/meld/DESCR @@ -4,4 +4,4 @@ compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. -This is the stable version based on GTK 2. +This is the version based on GTK 3. diff --git a/devel/meld/Makefile b/devel/meld/Makefile index 15943172a7d..a941d7fea29 100644 --- a/devel/meld/Makefile +++ b/devel/meld/Makefile @@ -1,33 +1,37 @@ -# $NetBSD: Makefile,v 1.52 2014/07/19 06:13:37 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2014/10/01 09:43:43 wiz Exp $ -DISTNAME= meld-1.8.6 +DISTNAME= meld-3.12.0 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/1.8/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/meld/3.12/} EXTRACT_SUFX= .tar.xz MAINTAINER= wiz@NetBSD.org HOMEPAGE= http://meldmerge.org/ -COMMENT= Visual diff and merge tool (GTK2 version) +COMMENT= Visual diff and merge tool (GTK3 version) LICENSE= gnu-gpl-v2 -DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.14.0:../../x11/py-gtk2 +BUILD_DEPENDS+= itstool-[0-9]*:../../textproc/itstool +DEPENDS+= ${PYPKGPREFIX}-gobject3>=3.8:../../devel/py-gobject3 +DEPENDS+= gsettings-desktop-schemas-[0-9]*:../../sysutils/gsettings-desktop-schemas -USE_PKGLOCALEDIR= YES -USE_TOOLS+= gmake msgfmt intltool -MAKE_FLAGS+= prefix=${PREFIX} -MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale -MAKE_FLAGS+= PYTHON=${PYTHONBIN} -REPLACE_PYTHON= bin/meld -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-gtk2 +USE_TOOLS+= intltool msgfmt -# remove unnecessarily created empty dirs -post-install: - ${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld - ${RMDIR} ${DESTDIR}${PREFIX}/share/pixmaps +PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 3.11; 3.12 will probably require 33+ + +SUBST_CLASSES+= man +SUBST_FILES.man= setup.py +SUBST_SED.man+= -e "s,share/man/man1,${PKGMANDIR}/man1," +SUBST_STAGE.man= pre-build +SUBST_MESSAGE.man= Fixing man page installation path. .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" -.include "../../lang/python/application.mk" -.include "../../databases/shared-mime-info/mimedb.mk" -.include "../../mk/omf-scrollkeeper.mk" +.include "../../lang/python/distutils.mk" +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.34.0 +.include "../../devel/glib2/buildlink3.mk" +.include "../../devel/glib2/schemas.mk" +BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.6 +.include "../../x11/gtk3/buildlink3.mk" +BUILDLINK_API_DEPENDS.gtksourceview3+= gtksourceview3>=3.6 +.include "../../x11/gtksourceview3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/meld/PLIST b/devel/meld/PLIST index 03344b80dce..fd6b9d13334 100644 --- a/devel/meld/PLIST +++ b/devel/meld/PLIST @@ -1,179 +1,262 @@ -@comment $NetBSD: PLIST,v 1.21 2013/12/31 18:03:51 wiz Exp $ +@comment $NetBSD: PLIST,v 1.22 2014/10/01 09:43:43 wiz Exp $ bin/meld -lib/meld/meld/__init__.py -lib/meld/meld/__init__.pyc -lib/meld/meld/__init__.pyo -lib/meld/meld/dbus_service.py -lib/meld/meld/dbus_service.pyc -lib/meld/meld/dbus_service.pyo -lib/meld/meld/diffmap.py -lib/meld/meld/diffmap.pyc -lib/meld/meld/diffmap.pyo -lib/meld/meld/diffutil.py -lib/meld/meld/diffutil.pyc -lib/meld/meld/diffutil.pyo -lib/meld/meld/dirdiff.py -lib/meld/meld/dirdiff.pyc -lib/meld/meld/dirdiff.pyo -lib/meld/meld/filediff.py -lib/meld/meld/filediff.pyc -lib/meld/meld/filediff.pyo -lib/meld/meld/filemerge.py -lib/meld/meld/filemerge.pyc -lib/meld/meld/filemerge.pyo -lib/meld/meld/filters.py -lib/meld/meld/filters.pyc -lib/meld/meld/filters.pyo -lib/meld/meld/linkmap.py -lib/meld/meld/linkmap.pyc -lib/meld/meld/linkmap.pyo -lib/meld/meld/matchers.py -lib/meld/meld/matchers.pyc -lib/meld/meld/matchers.pyo -lib/meld/meld/meldapp.py -lib/meld/meld/meldapp.pyc -lib/meld/meld/meldapp.pyo -lib/meld/meld/meldbuffer.py -lib/meld/meld/meldbuffer.pyc -lib/meld/meld/meldbuffer.pyo -lib/meld/meld/melddoc.py -lib/meld/meld/melddoc.pyc -lib/meld/meld/melddoc.pyo -lib/meld/meld/meldwindow.py -lib/meld/meld/meldwindow.pyc -lib/meld/meld/meldwindow.pyo -lib/meld/meld/merge.py -lib/meld/meld/merge.pyc -lib/meld/meld/merge.pyo -lib/meld/meld/misc.py -lib/meld/meld/misc.pyc -lib/meld/meld/misc.pyo -lib/meld/meld/newdifftab.py -lib/meld/meld/newdifftab.pyc -lib/meld/meld/newdifftab.pyo -lib/meld/meld/patchdialog.py -lib/meld/meld/patchdialog.pyc -lib/meld/meld/patchdialog.pyo -lib/meld/meld/paths.py -lib/meld/meld/paths.pyc -lib/meld/meld/paths.pyo -lib/meld/meld/preferences.py -lib/meld/meld/preferences.pyc -lib/meld/meld/preferences.pyo -lib/meld/meld/recent.py -lib/meld/meld/recent.pyc -lib/meld/meld/recent.pyo -lib/meld/meld/task.py -lib/meld/meld/task.pyc -lib/meld/meld/task.pyo -lib/meld/meld/test_matchers.py -lib/meld/meld/test_matchers.pyc -lib/meld/meld/test_matchers.pyo -lib/meld/meld/tree.py -lib/meld/meld/tree.pyc -lib/meld/meld/tree.pyo -lib/meld/meld/ui/__init__.py -lib/meld/meld/ui/__init__.pyc -lib/meld/meld/ui/__init__.pyo -lib/meld/meld/ui/emblemcellrenderer.py -lib/meld/meld/ui/emblemcellrenderer.pyc -lib/meld/meld/ui/emblemcellrenderer.pyo -lib/meld/meld/ui/findbar.py -lib/meld/meld/ui/findbar.pyc -lib/meld/meld/ui/findbar.pyo -lib/meld/meld/ui/gladesupport.py -lib/meld/meld/ui/gladesupport.pyc -lib/meld/meld/ui/gladesupport.pyo -lib/meld/meld/ui/gnomeglade.py -lib/meld/meld/ui/gnomeglade.pyc -lib/meld/meld/ui/gnomeglade.pyo -lib/meld/meld/ui/historyentry.py -lib/meld/meld/ui/historyentry.pyc -lib/meld/meld/ui/historyentry.pyo -lib/meld/meld/ui/listwidget.py -lib/meld/meld/ui/listwidget.pyc -lib/meld/meld/ui/listwidget.pyo -lib/meld/meld/ui/msgarea.py -lib/meld/meld/ui/msgarea.pyc -lib/meld/meld/ui/msgarea.pyo -lib/meld/meld/ui/notebooklabel.py -lib/meld/meld/ui/notebooklabel.pyc -lib/meld/meld/ui/notebooklabel.pyo -lib/meld/meld/ui/statusbar.py -lib/meld/meld/ui/statusbar.pyc -lib/meld/meld/ui/statusbar.pyo -lib/meld/meld/ui/vcdialogs.py -lib/meld/meld/ui/vcdialogs.pyc -lib/meld/meld/ui/vcdialogs.pyo -lib/meld/meld/ui/wraplabel.py -lib/meld/meld/ui/wraplabel.pyc -lib/meld/meld/ui/wraplabel.pyo -lib/meld/meld/undo.py -lib/meld/meld/undo.pyc -lib/meld/meld/undo.pyo -lib/meld/meld/util/__init__.py -lib/meld/meld/util/__init__.pyc -lib/meld/meld/util/__init__.pyo -lib/meld/meld/util/compat.py -lib/meld/meld/util/compat.pyc -lib/meld/meld/util/compat.pyo -lib/meld/meld/util/prefs.py -lib/meld/meld/util/prefs.pyc -lib/meld/meld/util/prefs.pyo -lib/meld/meld/util/sourceviewer.py -lib/meld/meld/util/sourceviewer.pyc -lib/meld/meld/util/sourceviewer.pyo -lib/meld/meld/vc/__init__.py -lib/meld/meld/vc/__init__.pyc -lib/meld/meld/vc/__init__.pyo -lib/meld/meld/vc/_null.py -lib/meld/meld/vc/_null.pyc -lib/meld/meld/vc/_null.pyo -lib/meld/meld/vc/_vc.py -lib/meld/meld/vc/_vc.pyc -lib/meld/meld/vc/_vc.pyo -lib/meld/meld/vc/bzr.py -lib/meld/meld/vc/bzr.pyc -lib/meld/meld/vc/bzr.pyo -lib/meld/meld/vc/cvs.py -lib/meld/meld/vc/cvs.pyc -lib/meld/meld/vc/cvs.pyo -lib/meld/meld/vc/darcs.py -lib/meld/meld/vc/darcs.pyc -lib/meld/meld/vc/darcs.pyo -lib/meld/meld/vc/fossil.py -lib/meld/meld/vc/fossil.pyc -lib/meld/meld/vc/fossil.pyo -lib/meld/meld/vc/git.py -lib/meld/meld/vc/git.pyc -lib/meld/meld/vc/git.pyo -lib/meld/meld/vc/mercurial.py -lib/meld/meld/vc/mercurial.pyc -lib/meld/meld/vc/mercurial.pyo -lib/meld/meld/vc/monotone.py -lib/meld/meld/vc/monotone.pyc -lib/meld/meld/vc/monotone.pyo -lib/meld/meld/vc/svk.py -lib/meld/meld/vc/svk.pyc -lib/meld/meld/vc/svk.pyo -lib/meld/meld/vc/svn.py -lib/meld/meld/vc/svn.pyc -lib/meld/meld/vc/svn.pyo -lib/meld/meld/vc/svn_17.py -lib/meld/meld/vc/svn_17.pyc -lib/meld/meld/vc/svn_17.pyo -lib/meld/meld/vcview.py -lib/meld/meld/vcview.pyc -lib/meld/meld/vcview.pyo +${PYSITELIB}/${EGG_FILE} +${PYSITELIB}/meld/__init__.py +${PYSITELIB}/meld/__init__.pyc +${PYSITELIB}/meld/__init__.pyo +${PYSITELIB}/meld/build_helpers.py +${PYSITELIB}/meld/build_helpers.pyc +${PYSITELIB}/meld/build_helpers.pyo +${PYSITELIB}/meld/conf.py +${PYSITELIB}/meld/conf.pyc +${PYSITELIB}/meld/conf.pyo +${PYSITELIB}/meld/const.py +${PYSITELIB}/meld/const.pyc +${PYSITELIB}/meld/const.pyo +${PYSITELIB}/meld/diffgrid.py +${PYSITELIB}/meld/diffgrid.pyc +${PYSITELIB}/meld/diffgrid.pyo +${PYSITELIB}/meld/diffmap.py +${PYSITELIB}/meld/diffmap.pyc +${PYSITELIB}/meld/diffmap.pyo +${PYSITELIB}/meld/diffutil.py +${PYSITELIB}/meld/diffutil.pyc +${PYSITELIB}/meld/diffutil.pyo +${PYSITELIB}/meld/dirdiff.py +${PYSITELIB}/meld/dirdiff.pyc +${PYSITELIB}/meld/dirdiff.pyo +${PYSITELIB}/meld/filediff.py +${PYSITELIB}/meld/filediff.pyc +${PYSITELIB}/meld/filediff.pyo +${PYSITELIB}/meld/filemerge.py +${PYSITELIB}/meld/filemerge.pyc +${PYSITELIB}/meld/filemerge.pyo +${PYSITELIB}/meld/filters.py +${PYSITELIB}/meld/filters.pyc +${PYSITELIB}/meld/filters.pyo +${PYSITELIB}/meld/gutterrendererchunk.py +${PYSITELIB}/meld/gutterrendererchunk.pyc +${PYSITELIB}/meld/gutterrendererchunk.pyo +${PYSITELIB}/meld/linkmap.py +${PYSITELIB}/meld/linkmap.pyc +${PYSITELIB}/meld/linkmap.pyo +${PYSITELIB}/meld/matchers.py +${PYSITELIB}/meld/matchers.pyc +${PYSITELIB}/meld/matchers.pyo +${PYSITELIB}/meld/meldapp.py +${PYSITELIB}/meld/meldapp.pyc +${PYSITELIB}/meld/meldapp.pyo +${PYSITELIB}/meld/meldbuffer.py +${PYSITELIB}/meld/meldbuffer.pyc +${PYSITELIB}/meld/meldbuffer.pyo +${PYSITELIB}/meld/melddoc.py +${PYSITELIB}/meld/melddoc.pyc +${PYSITELIB}/meld/melddoc.pyo +${PYSITELIB}/meld/meldwindow.py +${PYSITELIB}/meld/meldwindow.pyc +${PYSITELIB}/meld/meldwindow.pyo +${PYSITELIB}/meld/merge.py +${PYSITELIB}/meld/merge.pyc +${PYSITELIB}/meld/merge.pyo +${PYSITELIB}/meld/misc.py +${PYSITELIB}/meld/misc.pyc +${PYSITELIB}/meld/misc.pyo +${PYSITELIB}/meld/newdifftab.py +${PYSITELIB}/meld/newdifftab.pyc +${PYSITELIB}/meld/newdifftab.pyo +${PYSITELIB}/meld/patchdialog.py +${PYSITELIB}/meld/patchdialog.pyc +${PYSITELIB}/meld/patchdialog.pyo +${PYSITELIB}/meld/preferences.py +${PYSITELIB}/meld/preferences.pyc +${PYSITELIB}/meld/preferences.pyo +${PYSITELIB}/meld/recent.py +${PYSITELIB}/meld/recent.pyc +${PYSITELIB}/meld/recent.pyo +${PYSITELIB}/meld/settings.py +${PYSITELIB}/meld/settings.pyc +${PYSITELIB}/meld/settings.pyo +${PYSITELIB}/meld/sourceview.py +${PYSITELIB}/meld/sourceview.pyc +${PYSITELIB}/meld/sourceview.pyo +${PYSITELIB}/meld/task.py +${PYSITELIB}/meld/task.pyc +${PYSITELIB}/meld/task.pyo +${PYSITELIB}/meld/tree.py +${PYSITELIB}/meld/tree.pyc +${PYSITELIB}/meld/tree.pyo +${PYSITELIB}/meld/ui/__init__.py +${PYSITELIB}/meld/ui/__init__.pyc +${PYSITELIB}/meld/ui/__init__.pyo +${PYSITELIB}/meld/ui/emblemcellrenderer.py +${PYSITELIB}/meld/ui/emblemcellrenderer.pyc +${PYSITELIB}/meld/ui/emblemcellrenderer.pyo +${PYSITELIB}/meld/ui/findbar.py +${PYSITELIB}/meld/ui/findbar.pyc +${PYSITELIB}/meld/ui/findbar.pyo +${PYSITELIB}/meld/ui/gladesupport.py +${PYSITELIB}/meld/ui/gladesupport.pyc +${PYSITELIB}/meld/ui/gladesupport.pyo +${PYSITELIB}/meld/ui/gnomeglade.py +${PYSITELIB}/meld/ui/gnomeglade.pyc +${PYSITELIB}/meld/ui/gnomeglade.pyo +${PYSITELIB}/meld/ui/historyentry.py +${PYSITELIB}/meld/ui/historyentry.pyc +${PYSITELIB}/meld/ui/historyentry.pyo +${PYSITELIB}/meld/ui/listwidget.py +${PYSITELIB}/meld/ui/listwidget.pyc +${PYSITELIB}/meld/ui/listwidget.pyo +${PYSITELIB}/meld/ui/msgarea.py +${PYSITELIB}/meld/ui/msgarea.pyc +${PYSITELIB}/meld/ui/msgarea.pyo +${PYSITELIB}/meld/ui/notebooklabel.py +${PYSITELIB}/meld/ui/notebooklabel.pyc +${PYSITELIB}/meld/ui/notebooklabel.pyo +${PYSITELIB}/meld/ui/statusbar.py +${PYSITELIB}/meld/ui/statusbar.pyc +${PYSITELIB}/meld/ui/statusbar.pyo +${PYSITELIB}/meld/ui/util.py +${PYSITELIB}/meld/ui/util.pyc +${PYSITELIB}/meld/ui/util.pyo +${PYSITELIB}/meld/ui/vcdialogs.py +${PYSITELIB}/meld/ui/vcdialogs.pyc +${PYSITELIB}/meld/ui/vcdialogs.pyo +${PYSITELIB}/meld/ui/wraplabel.py +${PYSITELIB}/meld/ui/wraplabel.pyc +${PYSITELIB}/meld/ui/wraplabel.pyo +${PYSITELIB}/meld/undo.py +${PYSITELIB}/meld/undo.pyc +${PYSITELIB}/meld/undo.pyo +${PYSITELIB}/meld/util/__init__.py +${PYSITELIB}/meld/util/__init__.pyc +${PYSITELIB}/meld/util/__init__.pyo +${PYSITELIB}/meld/util/compat.py +${PYSITELIB}/meld/util/compat.pyc +${PYSITELIB}/meld/util/compat.pyo +${PYSITELIB}/meld/vc/COPYING +${PYSITELIB}/meld/vc/README +${PYSITELIB}/meld/vc/__init__.py +${PYSITELIB}/meld/vc/__init__.pyc +${PYSITELIB}/meld/vc/__init__.pyo +${PYSITELIB}/meld/vc/_null.py +${PYSITELIB}/meld/vc/_null.pyc +${PYSITELIB}/meld/vc/_null.pyo +${PYSITELIB}/meld/vc/_vc.py +${PYSITELIB}/meld/vc/_vc.pyc +${PYSITELIB}/meld/vc/_vc.pyo +${PYSITELIB}/meld/vc/bzr.py +${PYSITELIB}/meld/vc/bzr.pyc +${PYSITELIB}/meld/vc/bzr.pyo +${PYSITELIB}/meld/vc/cvs.py +${PYSITELIB}/meld/vc/cvs.pyc +${PYSITELIB}/meld/vc/cvs.pyo +${PYSITELIB}/meld/vc/darcs.py +${PYSITELIB}/meld/vc/darcs.pyc +${PYSITELIB}/meld/vc/darcs.pyo +${PYSITELIB}/meld/vc/fossil.py +${PYSITELIB}/meld/vc/fossil.pyc +${PYSITELIB}/meld/vc/fossil.pyo +${PYSITELIB}/meld/vc/git.py +${PYSITELIB}/meld/vc/git.pyc +${PYSITELIB}/meld/vc/git.pyo +${PYSITELIB}/meld/vc/mercurial.py +${PYSITELIB}/meld/vc/mercurial.pyc +${PYSITELIB}/meld/vc/mercurial.pyo +${PYSITELIB}/meld/vc/monotone.py +${PYSITELIB}/meld/vc/monotone.pyc +${PYSITELIB}/meld/vc/monotone.pyo +${PYSITELIB}/meld/vc/svk.py +${PYSITELIB}/meld/vc/svk.pyc +${PYSITELIB}/meld/vc/svk.pyo +${PYSITELIB}/meld/vc/svn.py +${PYSITELIB}/meld/vc/svn.pyc +${PYSITELIB}/meld/vc/svn.pyo +${PYSITELIB}/meld/vc/svn_17.py +${PYSITELIB}/meld/vc/svn_17.pyc +${PYSITELIB}/meld/vc/svn_17.pyo +${PYSITELIB}/meld/vcview.py +${PYSITELIB}/meld/vcview.pyc +${PYSITELIB}/meld/vcview.pyo +man/man1/meld.1 share/appdata/meld.appdata.xml share/applications/meld.desktop -share/gnome/help/meld/C/meld.xml -share/gnome/help/meld/es/meld.xml -share/gnome/help/meld/fr/meld.xml +share/doc/${PKGNAME}/COPYING +share/doc/${PKGNAME}/NEWS +share/glib-2.0/schemas/org.gnome.meld.gschema.xml +share/help/C/meld/command-line.page +share/help/C/meld/file-changes.page +share/help/C/meld/file-filters.page +share/help/C/meld/file-mode.page +share/help/C/meld/flattened-view.page +share/help/C/meld/folder-mode.page +share/help/C/meld/index.page +share/help/C/meld/introduction.page +share/help/C/meld/keyboard-shortcuts.page +share/help/C/meld/legal.xml +share/help/C/meld/missing-functionality.page +share/help/C/meld/preferences.page +share/help/C/meld/resolving-conflicts.page +share/help/C/meld/text-filters.page +share/help/C/meld/vc-mode.page +share/help/C/meld/vc-supported.page +share/help/cs/meld/command-line.page +share/help/cs/meld/file-changes.page +share/help/cs/meld/file-filters.page +share/help/cs/meld/file-mode.page +share/help/cs/meld/flattened-view.page +share/help/cs/meld/folder-mode.page +share/help/cs/meld/index.page +share/help/cs/meld/introduction.page +share/help/cs/meld/keyboard-shortcuts.page +share/help/cs/meld/legal.xml +share/help/cs/meld/missing-functionality.page +share/help/cs/meld/preferences.page +share/help/cs/meld/resolving-conflicts.page +share/help/cs/meld/text-filters.page +share/help/cs/meld/vc-mode.page +share/help/cs/meld/vc-supported.page +share/help/el/meld/command-line.page +share/help/el/meld/file-changes.page +share/help/el/meld/file-filters.page +share/help/el/meld/file-mode.page +share/help/el/meld/flattened-view.page +share/help/el/meld/folder-mode.page +share/help/el/meld/index.page +share/help/el/meld/introduction.page +share/help/el/meld/keyboard-shortcuts.page +share/help/el/meld/legal.xml +share/help/el/meld/missing-functionality.page +share/help/el/meld/preferences.page +share/help/el/meld/resolving-conflicts.page +share/help/el/meld/text-filters.page +share/help/el/meld/vc-mode.page +share/help/el/meld/vc-supported.page +share/help/es/meld/command-line.page +share/help/es/meld/file-changes.page +share/help/es/meld/file-filters.page +share/help/es/meld/file-mode.page +share/help/es/meld/flattened-view.page +share/help/es/meld/folder-mode.page +share/help/es/meld/index.page +share/help/es/meld/introduction.page +share/help/es/meld/keyboard-shortcuts.page +share/help/es/meld/legal.xml +share/help/es/meld/missing-functionality.page +share/help/es/meld/preferences.page +share/help/es/meld/resolving-conflicts.page +share/help/es/meld/text-filters.page +share/help/es/meld/vc-mode.page +share/help/es/meld/vc-supported.page share/icons/HighContrast/scalable/apps/meld.svg +share/icons/hicolor/16x16/actions/meld-change-apply-left.png +share/icons/hicolor/16x16/actions/meld-change-apply-right.png +share/icons/hicolor/16x16/actions/meld-change-copy.png +share/icons/hicolor/16x16/actions/meld-change-delete.png +share/icons/hicolor/16x16/apps/meld-version-control.png share/icons/hicolor/16x16/apps/meld.png share/icons/hicolor/22x22/apps/meld.png share/icons/hicolor/32x32/apps/meld.png +share/icons/hicolor/48x48/apps/meld-version-control.png share/icons/hicolor/48x48/apps/meld.png share/icons/hicolor/scalable/apps/meld.svg share/locale/ar/LC_MESSAGES/meld.mo @@ -193,6 +276,7 @@ share/locale/eu/LC_MESSAGES/meld.mo share/locale/fi/LC_MESSAGES/meld.mo share/locale/fr/LC_MESSAGES/meld.mo share/locale/gl/LC_MESSAGES/meld.mo +share/locale/he/LC_MESSAGES/meld.mo share/locale/hu/LC_MESSAGES/meld.mo share/locale/id/LC_MESSAGES/meld.mo share/locale/it/LC_MESSAGES/meld.mo @@ -214,32 +298,28 @@ share/locale/sq/LC_MESSAGES/meld.mo share/locale/sr/LC_MESSAGES/meld.mo share/locale/sr@latin/LC_MESSAGES/meld.mo share/locale/sv/LC_MESSAGES/meld.mo +share/locale/tr/LC_MESSAGES/meld.mo share/locale/vi/LC_MESSAGES/meld.mo share/locale/zh_CN/LC_MESSAGES/meld.mo share/locale/zh_TW/LC_MESSAGES/meld.mo -share/meld/gtkrc -share/meld/icons/button_apply0.xpm -share/meld/icons/button_apply1.xpm -share/meld/icons/button_copy0.xpm -share/meld/icons/button_copy1.xpm -share/meld/icons/button_delete.xpm +share/meld/icons/COPYING +share/meld/icons/COPYING_CCBYSA3 share/meld/icons/emblem-meld-newer-file.png share/meld/icons/filter-ignored-24.png share/meld/icons/filter-modified-24.png share/meld/icons/filter-nonvc-24.png share/meld/icons/filter-normal-24.png -share/meld/icons/meld-locked.png -share/meld/icons/meld-unlocked.png -share/meld/icons/meld-vc-icon.png share/meld/icons/vc-add-24.png share/meld/icons/vc-checkout-24.png share/meld/icons/vc-commit-24.png -share/meld/icons/vc-icon.png share/meld/icons/vc-push-24.png share/meld/icons/vc-remove-24.png share/meld/icons/vc-resolve-24.png share/meld/icons/vc-update-24.png +share/meld/meld.css share/meld/ui/EditableList.ui +share/meld/ui/application.ui +share/meld/ui/appmenu-fallback.xml share/meld/ui/dirdiff-ui.xml share/meld/ui/dirdiff.ui share/meld/ui/filediff-ui.xml @@ -253,6 +333,3 @@ share/meld/ui/tab-placeholder.ui share/meld/ui/vcview-ui.xml share/meld/ui/vcview.ui share/mime/packages/meld.xml -share/omf/meld/meld-C.omf -share/omf/meld/meld-es.omf -share/omf/meld/meld-fr.omf diff --git a/devel/meld/distinfo b/devel/meld/distinfo index 6821613bda4..4fc5782f5c8 100644 --- a/devel/meld/distinfo +++ b/devel/meld/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.29 2014/07/19 06:13:37 wiz Exp $ +$NetBSD: distinfo,v 1.30 2014/10/01 09:43:43 wiz Exp $ -SHA1 (meld-1.8.6.tar.xz) = 33e23f2e56b27f2ac5cd21032c7eefe9dd469480 -RMD160 (meld-1.8.6.tar.xz) = 7c981c08a015a1a0706cbe98416a25e0963af0cb -Size (meld-1.8.6.tar.xz) = 447196 bytes +SHA1 (meld-3.12.0.tar.xz) = 1481f453463da29357953933362cccfa336313bd +RMD160 (meld-3.12.0.tar.xz) = 311889c5adbd548dffa2c1f0ab6886a9f3a72f15 +Size (meld-3.12.0.tar.xz) = 460596 bytes -- cgit v1.2.3