[Midnightbsd-cvs] mports [18608] trunk/textproc/meld: update meld
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Apr 10 07:51:42 EDT 2015
Revision: 18608
http://svnweb.midnightbsd.org/mports/?rev=18608
Author: laffer1
Date: 2015-04-10 07:51:42 -0400 (Fri, 10 Apr 2015)
Log Message:
-----------
update meld
Modified Paths:
--------------
trunk/textproc/meld/Makefile
trunk/textproc/meld/distinfo
trunk/textproc/meld/pkg-descr
trunk/textproc/meld/pkg-plist
Added Paths:
-----------
trunk/textproc/meld/files/
trunk/textproc/meld/files/patch-setup.py
Modified: trunk/textproc/meld/Makefile
===================================================================
--- trunk/textproc/meld/Makefile 2015-04-10 11:51:33 UTC (rev 18607)
+++ trunk/textproc/meld/Makefile 2015-04-10 11:51:42 UTC (rev 18608)
@@ -1,38 +1,25 @@
# $MidnightBSD$
PORTNAME= meld
-PORTVERSION= 1.8.4
+PORTVERSION= 3.12.2
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
MAINTAINER= ports at MidnightBSD.org
-COMMENT= GNOME 2 visual diff and merge tool
+COMMENT= GNOME visual diff and merge tool
LICENSE= gpl2
-USE_XZ= yes
-USE_GNOME= pygnome2
-USES= desktop-file-utils gmake shared-mime-info shebangfix
-python_OLD_CMD= ${SETENV} python
-python_CMD= ${PYTHON_CMD}
+BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
+
+USES= desktop-file-utils gettext python:2 shared-mime-info \
+ shebangfix tar:xz
SHEBANG_FILES= bin/meld
-USE_PYTHON= 2
-MAKE_ARGS= prefix=${PREFIX}
+USE_PYTHON= distutils
+USE_GNOME= gtksourceview3 pygobject3
+GLIB_SCHEMAS= org.gnome.meld.gschema.xml
+PYDISTUTILS_INSTALLNOSINGLE= yes
+PYDISTUTILS_INSTALL_TARGET= --no-update-icon-cache --no-compile-schemas install
INSTALLS_ICONS= yes
-INSTALLS_OMF= yes
-OPTIONS_DEFINE= NLS PYGNOMEDESKTOP
-OPTIONS_SUB= yes
-
-NLS_USES= gettext
-
-PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies)
-PYGNOMEDESKTOP_USE= GNOME=pygnomedesktop
-
-post-patch:
- @${REINPLACE_CMD} -e 's|^LANG :=|LANG_ :=|g ; s|$$(LANG)|$$(LANG_)|g ; \
- s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g' \
- ${WRKSRC}/help/C/Makefile ${WRKSRC}/help/es/Makefile \
- ${WRKSRC}/help/fr/Makefile
-
.include <bsd.port.mk>
Modified: trunk/textproc/meld/distinfo
===================================================================
--- trunk/textproc/meld/distinfo 2015-04-10 11:51:33 UTC (rev 18607)
+++ trunk/textproc/meld/distinfo 2015-04-10 11:51:42 UTC (rev 18608)
@@ -1,2 +1,2 @@
-SHA256 (meld-1.8.4.tar.xz) = b46e5786343f236d203037a7ace8f1b28145a51a3f84fa527efcf62f47b5b8de
-SIZE (meld-1.8.4.tar.xz) = 421332
+SHA256 (meld-3.12.2.tar.xz) = 0938e6e6b4de59dbf66947f67c8c5c3d3c834feb8dabae3a047154af9544a101
+SIZE (meld-3.12.2.tar.xz) = 461932
Added: trunk/textproc/meld/files/patch-setup.py
===================================================================
--- trunk/textproc/meld/files/patch-setup.py (rev 0)
+++ trunk/textproc/meld/files/patch-setup.py 2015-04-10 11:51:42 UTC (rev 18608)
@@ -0,0 +1,17 @@
+--- setup.py.orig 2014-11-22 12:24:31 UTC
++++ setup.py
+@@ -37,11 +37,11 @@ setup(
+ },
+ scripts=['bin/meld'],
+ data_files=[
+- ('share/man/man1',
++ ('man/man1',
+ ['meld.1']
+ ),
+- ('share/doc/meld-' + meld.conf.__version__,
+- ['COPYING', 'NEWS']
++ ('share/doc/meld',
++ ['NEWS']
+ ),
+ ('share/meld',
+ ['data/meld.css']
Property changes on: trunk/textproc/meld/files/patch-setup.py
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/meld/pkg-descr
===================================================================
--- trunk/textproc/meld/pkg-descr 2015-04-10 11:51:33 UTC (rev 18607)
+++ trunk/textproc/meld/pkg-descr 2015-04-10 11:51:42 UTC (rev 18608)
@@ -1,4 +1,4 @@
-Meld is a GNOME 2 visual diff and merge tool. It integrates especially well
+Meld is a GNOME visual diff and merge tool. It integrates especially well
with CVS. The diff viewer lets you edit files in place (diffs update
dynamically), and a middle column shows detailed changes and allows merges.
The margins show location of changes for easy navigation, and it also
Modified: trunk/textproc/meld/pkg-plist
===================================================================
--- trunk/textproc/meld/pkg-plist 2015-04-10 11:51:33 UTC (rev 18607)
+++ trunk/textproc/meld/pkg-plist 2015-04-10 11:51:42 UTC (rev 18608)
@@ -1,244 +1,321 @@
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
+%%PYTHON_SITELIBDIR%%/meld/__init__.py
+%%PYTHON_SITELIBDIR%%/meld/__init__.pyc
+%%PYTHON_SITELIBDIR%%/meld/__init__.pyo
+%%PYTHON_SITELIBDIR%%/meld/build_helpers.py
+%%PYTHON_SITELIBDIR%%/meld/build_helpers.pyc
+%%PYTHON_SITELIBDIR%%/meld/build_helpers.pyo
+%%PYTHON_SITELIBDIR%%/meld/conf.py
+%%PYTHON_SITELIBDIR%%/meld/conf.pyc
+%%PYTHON_SITELIBDIR%%/meld/conf.pyo
+%%PYTHON_SITELIBDIR%%/meld/const.py
+%%PYTHON_SITELIBDIR%%/meld/const.pyc
+%%PYTHON_SITELIBDIR%%/meld/const.pyo
+%%PYTHON_SITELIBDIR%%/meld/diffgrid.py
+%%PYTHON_SITELIBDIR%%/meld/diffgrid.pyc
+%%PYTHON_SITELIBDIR%%/meld/diffgrid.pyo
+%%PYTHON_SITELIBDIR%%/meld/diffmap.py
+%%PYTHON_SITELIBDIR%%/meld/diffmap.pyc
+%%PYTHON_SITELIBDIR%%/meld/diffmap.pyo
+%%PYTHON_SITELIBDIR%%/meld/diffutil.py
+%%PYTHON_SITELIBDIR%%/meld/diffutil.pyc
+%%PYTHON_SITELIBDIR%%/meld/diffutil.pyo
+%%PYTHON_SITELIBDIR%%/meld/dirdiff.py
+%%PYTHON_SITELIBDIR%%/meld/dirdiff.pyc
+%%PYTHON_SITELIBDIR%%/meld/dirdiff.pyo
+%%PYTHON_SITELIBDIR%%/meld/filediff.py
+%%PYTHON_SITELIBDIR%%/meld/filediff.pyc
+%%PYTHON_SITELIBDIR%%/meld/filediff.pyo
+%%PYTHON_SITELIBDIR%%/meld/filemerge.py
+%%PYTHON_SITELIBDIR%%/meld/filemerge.pyc
+%%PYTHON_SITELIBDIR%%/meld/filemerge.pyo
+%%PYTHON_SITELIBDIR%%/meld/filters.py
+%%PYTHON_SITELIBDIR%%/meld/filters.pyc
+%%PYTHON_SITELIBDIR%%/meld/filters.pyo
+%%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.py
+%%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.pyc
+%%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.pyo
+%%PYTHON_SITELIBDIR%%/meld/linkmap.py
+%%PYTHON_SITELIBDIR%%/meld/linkmap.pyc
+%%PYTHON_SITELIBDIR%%/meld/linkmap.pyo
+%%PYTHON_SITELIBDIR%%/meld/matchers.py
+%%PYTHON_SITELIBDIR%%/meld/matchers.pyc
+%%PYTHON_SITELIBDIR%%/meld/matchers.pyo
+%%PYTHON_SITELIBDIR%%/meld/meldapp.py
+%%PYTHON_SITELIBDIR%%/meld/meldapp.pyc
+%%PYTHON_SITELIBDIR%%/meld/meldapp.pyo
+%%PYTHON_SITELIBDIR%%/meld/meldbuffer.py
+%%PYTHON_SITELIBDIR%%/meld/meldbuffer.pyc
+%%PYTHON_SITELIBDIR%%/meld/meldbuffer.pyo
+%%PYTHON_SITELIBDIR%%/meld/melddoc.py
+%%PYTHON_SITELIBDIR%%/meld/melddoc.pyc
+%%PYTHON_SITELIBDIR%%/meld/melddoc.pyo
+%%PYTHON_SITELIBDIR%%/meld/meldwindow.py
+%%PYTHON_SITELIBDIR%%/meld/meldwindow.pyc
+%%PYTHON_SITELIBDIR%%/meld/meldwindow.pyo
+%%PYTHON_SITELIBDIR%%/meld/merge.py
+%%PYTHON_SITELIBDIR%%/meld/merge.pyc
+%%PYTHON_SITELIBDIR%%/meld/merge.pyo
+%%PYTHON_SITELIBDIR%%/meld/misc.py
+%%PYTHON_SITELIBDIR%%/meld/misc.pyc
+%%PYTHON_SITELIBDIR%%/meld/misc.pyo
+%%PYTHON_SITELIBDIR%%/meld/newdifftab.py
+%%PYTHON_SITELIBDIR%%/meld/newdifftab.pyc
+%%PYTHON_SITELIBDIR%%/meld/newdifftab.pyo
+%%PYTHON_SITELIBDIR%%/meld/patchdialog.py
+%%PYTHON_SITELIBDIR%%/meld/patchdialog.pyc
+%%PYTHON_SITELIBDIR%%/meld/patchdialog.pyo
+%%PYTHON_SITELIBDIR%%/meld/preferences.py
+%%PYTHON_SITELIBDIR%%/meld/preferences.pyc
+%%PYTHON_SITELIBDIR%%/meld/preferences.pyo
+%%PYTHON_SITELIBDIR%%/meld/recent.py
+%%PYTHON_SITELIBDIR%%/meld/recent.pyc
+%%PYTHON_SITELIBDIR%%/meld/recent.pyo
+%%PYTHON_SITELIBDIR%%/meld/settings.py
+%%PYTHON_SITELIBDIR%%/meld/settings.pyc
+%%PYTHON_SITELIBDIR%%/meld/settings.pyo
+%%PYTHON_SITELIBDIR%%/meld/sourceview.py
+%%PYTHON_SITELIBDIR%%/meld/sourceview.pyc
+%%PYTHON_SITELIBDIR%%/meld/sourceview.pyo
+%%PYTHON_SITELIBDIR%%/meld/task.py
+%%PYTHON_SITELIBDIR%%/meld/task.pyc
+%%PYTHON_SITELIBDIR%%/meld/task.pyo
+%%PYTHON_SITELIBDIR%%/meld/tree.py
+%%PYTHON_SITELIBDIR%%/meld/tree.pyc
+%%PYTHON_SITELIBDIR%%/meld/tree.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/__init__.py
+%%PYTHON_SITELIBDIR%%/meld/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.py
+%%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/findbar.py
+%%PYTHON_SITELIBDIR%%/meld/ui/findbar.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/findbar.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.py
+%%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.py
+%%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/historyentry.py
+%%PYTHON_SITELIBDIR%%/meld/ui/historyentry.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/historyentry.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/listwidget.py
+%%PYTHON_SITELIBDIR%%/meld/ui/listwidget.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/listwidget.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/msgarea.py
+%%PYTHON_SITELIBDIR%%/meld/ui/msgarea.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/msgarea.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.py
+%%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/statusbar.py
+%%PYTHON_SITELIBDIR%%/meld/ui/statusbar.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/statusbar.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/util.py
+%%PYTHON_SITELIBDIR%%/meld/ui/util.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/util.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.py
+%%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/wraplabel.py
+%%PYTHON_SITELIBDIR%%/meld/ui/wraplabel.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/wraplabel.pyo
+%%PYTHON_SITELIBDIR%%/meld/undo.py
+%%PYTHON_SITELIBDIR%%/meld/undo.pyc
+%%PYTHON_SITELIBDIR%%/meld/undo.pyo
+%%PYTHON_SITELIBDIR%%/meld/util/__init__.py
+%%PYTHON_SITELIBDIR%%/meld/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/meld/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/meld/util/compat.py
+%%PYTHON_SITELIBDIR%%/meld/util/compat.pyc
+%%PYTHON_SITELIBDIR%%/meld/util/compat.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/COPYING
+%%PYTHON_SITELIBDIR%%/meld/vc/README
+%%PYTHON_SITELIBDIR%%/meld/vc/__init__.py
+%%PYTHON_SITELIBDIR%%/meld/vc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/_null.py
+%%PYTHON_SITELIBDIR%%/meld/vc/_null.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/_null.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/_vc.py
+%%PYTHON_SITELIBDIR%%/meld/vc/_vc.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/_vc.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/bzr.py
+%%PYTHON_SITELIBDIR%%/meld/vc/bzr.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/bzr.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/cvs.py
+%%PYTHON_SITELIBDIR%%/meld/vc/cvs.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/cvs.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/darcs.py
+%%PYTHON_SITELIBDIR%%/meld/vc/darcs.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/darcs.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/fossil.py
+%%PYTHON_SITELIBDIR%%/meld/vc/fossil.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/fossil.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/git.py
+%%PYTHON_SITELIBDIR%%/meld/vc/git.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/git.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/mercurial.py
+%%PYTHON_SITELIBDIR%%/meld/vc/mercurial.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/mercurial.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/monotone.py
+%%PYTHON_SITELIBDIR%%/meld/vc/monotone.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/monotone.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/svk.py
+%%PYTHON_SITELIBDIR%%/meld/vc/svk.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/svk.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/svn.py
+%%PYTHON_SITELIBDIR%%/meld/vc/svn.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/svn.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/svn_17.py
+%%PYTHON_SITELIBDIR%%/meld/vc/svn_17.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/svn_17.pyo
+%%PYTHON_SITELIBDIR%%/meld/vcview.py
+%%PYTHON_SITELIBDIR%%/meld/vcview.pyc
+%%PYTHON_SITELIBDIR%%/meld/vcview.pyo
+man/man1/meld.1.gz
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
+%%DOCSDIR%%/NEWS
+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
-%%NLS%%share/locale/ar/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/ca at valencia/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/da/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/de/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/el/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/en_CA/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/es/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/id/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/it/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/ne/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/oc/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/rw/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/sr at latin/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/meld.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/meld.mo
-%%DATADIR%%/gtkrc
-%%DATADIR%%/icons/button_apply0.xpm
-%%DATADIR%%/icons/button_apply1.xpm
-%%DATADIR%%/icons/button_copy0.xpm
-%%DATADIR%%/icons/button_copy1.xpm
-%%DATADIR%%/icons/button_delete.xpm
+share/locale/ar/LC_MESSAGES/meld.mo
+share/locale/bg/LC_MESSAGES/meld.mo
+share/locale/ca/LC_MESSAGES/meld.mo
+share/locale/ca at valencia/LC_MESSAGES/meld.mo
+share/locale/cs/LC_MESSAGES/meld.mo
+share/locale/da/LC_MESSAGES/meld.mo
+share/locale/de/LC_MESSAGES/meld.mo
+share/locale/dz/LC_MESSAGES/meld.mo
+share/locale/el/LC_MESSAGES/meld.mo
+share/locale/en_CA/LC_MESSAGES/meld.mo
+share/locale/en_GB/LC_MESSAGES/meld.mo
+share/locale/eo/LC_MESSAGES/meld.mo
+share/locale/es/LC_MESSAGES/meld.mo
+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
+share/locale/ja/LC_MESSAGES/meld.mo
+share/locale/ko/LC_MESSAGES/meld.mo
+share/locale/nb/LC_MESSAGES/meld.mo
+share/locale/ne/LC_MESSAGES/meld.mo
+share/locale/nl/LC_MESSAGES/meld.mo
+share/locale/oc/LC_MESSAGES/meld.mo
+share/locale/pa/LC_MESSAGES/meld.mo
+share/locale/pl/LC_MESSAGES/meld.mo
+share/locale/pt/LC_MESSAGES/meld.mo
+share/locale/pt_BR/LC_MESSAGES/meld.mo
+share/locale/ro/LC_MESSAGES/meld.mo
+share/locale/ru/LC_MESSAGES/meld.mo
+share/locale/rw/LC_MESSAGES/meld.mo
+share/locale/sl/LC_MESSAGES/meld.mo
+share/locale/sq/LC_MESSAGES/meld.mo
+share/locale/sr/LC_MESSAGES/meld.mo
+share/locale/sr at 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
+%%DATADIR%%/icons/COPYING
+%%DATADIR%%/icons/COPYING_CCBYSA3
%%DATADIR%%/icons/emblem-meld-newer-file.png
%%DATADIR%%/icons/filter-ignored-24.png
%%DATADIR%%/icons/filter-modified-24.png
%%DATADIR%%/icons/filter-nonvc-24.png
%%DATADIR%%/icons/filter-normal-24.png
-%%DATADIR%%/icons/meld-locked.png
-%%DATADIR%%/icons/meld-unlocked.png
-%%DATADIR%%/icons/meld-vc-icon.png
%%DATADIR%%/icons/vc-add-24.png
%%DATADIR%%/icons/vc-checkout-24.png
%%DATADIR%%/icons/vc-commit-24.png
-%%DATADIR%%/icons/vc-icon.png
%%DATADIR%%/icons/vc-push-24.png
%%DATADIR%%/icons/vc-remove-24.png
%%DATADIR%%/icons/vc-resolve-24.png
%%DATADIR%%/icons/vc-update-24.png
+%%DATADIR%%/meld.css
%%DATADIR%%/ui/EditableList.ui
+%%DATADIR%%/ui/application.ui
+%%DATADIR%%/ui/appmenu-fallback.xml
%%DATADIR%%/ui/dirdiff-ui.xml
%%DATADIR%%/ui/dirdiff.ui
%%DATADIR%%/ui/filediff-ui.xml
@@ -252,27 +329,7 @@
%%DATADIR%%/ui/vcview-ui.xml
%%DATADIR%%/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
- at dirrm share/omf/meld
- at dirrmtry share/mime/packages
- at dirrmtry share/mime
- at dirrm %%DATADIR%%/ui
- at dirrm %%DATADIR%%/icons
- at dirrm %%DATADIR%%
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/icons/HighContrast/scalable/apps
- at dirrmtry share/icons/HighContrast/scalable
- at dirrmtry share/icons/HighContrast
- at dirrm share/gnome/help/meld/fr
- at dirrm share/gnome/help/meld/es
- at dirrm share/gnome/help/meld/C
- at dirrm share/gnome/help/meld
- at dirrmtry share/appdata
- at dirrm lib/meld/meld/vc
- at dirrm lib/meld/meld/util
- at dirrm lib/meld/meld/ui
- at dirrm lib/meld/meld
- at dirrm lib/meld
+ at dir share/help/es/meld/figures
+ at dir share/help/el/meld/figures
+ at dir share/help/cs/meld/figures
+ at dir share/help/C/meld/figures
More information about the Midnightbsd-cvs
mailing list