Index: head/textproc/meld/Makefile =================================================================== --- head/textproc/meld/Makefile (revision 493837) +++ head/textproc/meld/Makefile (revision 493838) @@ -1,34 +1,35 @@ # Created by: Pav Lucistnik # $FreeBSD$ PORTNAME= meld -PORTVERSION= 3.18.2 +PORTVERSION= 3.20.0 CATEGORIES= textproc devel python MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME visual diff and merge tool LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= itstool:textproc/itstool RUN_DEPENDS= gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas -USES= desktop-file-utils gettext python:3.4+ shared-mime-info \ +USES= desktop-file-utils gettext gnome python:3.4+ shared-mime-info \ shebangfix tar:xz -SHEBANG_FILES= bin/meld USE_PYTHON= distutils noflavors USE_GNOME= gtksourceview3 intltool libxml2:build pygobject3 + +SHEBANG_FILES= bin/meld GLIB_SCHEMAS= org.gnome.meld.gschema.xml PYDISTUTILS_INSTALL_TARGET= --no-update-icon-cache --no-compile-schemas install INSTALLS_ICONS= yes NO_ARCH= yes PLIST_SUB= PORTVER=${PORTVERSION} .include PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} --root=${STAGEDIR} .include Index: head/textproc/meld/distinfo =================================================================== --- head/textproc/meld/distinfo (revision 493837) +++ head/textproc/meld/distinfo (revision 493838) @@ -1,3 +1,3 @@ -TIMESTAMP = 1531227251 -SHA256 (meld-3.18.2.tar.xz) = 1934abf4397e6a31b3c3d3d372ddb2aa6e6be499a71d96b114f14707afe93781 -SIZE (meld-3.18.2.tar.xz) = 568292 +TIMESTAMP = 1546786330 +SHA256 (meld-3.20.0.tar.xz) = cb40fe2f749325d7a13c35ca4928664744ced248793cd5705a630af074887086 +SIZE (meld-3.20.0.tar.xz) = 591956 Index: head/textproc/meld/pkg-plist =================================================================== --- head/textproc/meld/pkg-plist (revision 493837) +++ head/textproc/meld/pkg-plist (revision 493838) @@ -1,283 +1,299 @@ bin/meld %%PYTHON_SITELIBDIR%%/meld/__init__.py %%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/meld/__pycache__/iohelpers.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/meld/__pycache__/treehelpers.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/build_helpers.py %%PYTHON_SITELIBDIR%%/meld/conf.py %%PYTHON_SITELIBDIR%%/meld/const.py %%PYTHON_SITELIBDIR%%/meld/diffgrid.py %%PYTHON_SITELIBDIR%%/meld/diffmap.py %%PYTHON_SITELIBDIR%%/meld/dirdiff.py %%PYTHON_SITELIBDIR%%/meld/filediff.py %%PYTHON_SITELIBDIR%%/meld/filemerge.py %%PYTHON_SITELIBDIR%%/meld/filters.py %%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.py +%%PYTHON_SITELIBDIR%%/meld/iohelpers.py %%PYTHON_SITELIBDIR%%/meld/linkmap.py %%PYTHON_SITELIBDIR%%/meld/matchers/__init__.py %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/matchers/diffutil.py %%PYTHON_SITELIBDIR%%/meld/matchers/helpers.py %%PYTHON_SITELIBDIR%%/meld/matchers/merge.py %%PYTHON_SITELIBDIR%%/meld/matchers/myers.py %%PYTHON_SITELIBDIR%%/meld/meldapp.py %%PYTHON_SITELIBDIR%%/meld/meldbuffer.py %%PYTHON_SITELIBDIR%%/meld/melddoc.py %%PYTHON_SITELIBDIR%%/meld/meldwindow.py %%PYTHON_SITELIBDIR%%/meld/misc.py %%PYTHON_SITELIBDIR%%/meld/newdifftab.py %%PYTHON_SITELIBDIR%%/meld/patchdialog.py %%PYTHON_SITELIBDIR%%/meld/preferences.py %%PYTHON_SITELIBDIR%%/meld/recent.py %%PYTHON_SITELIBDIR%%/meld/settings.py %%PYTHON_SITELIBDIR%%/meld/sourceview.py %%PYTHON_SITELIBDIR%%/meld/task.py %%PYTHON_SITELIBDIR%%/meld/tree.py +%%PYTHON_SITELIBDIR%%/meld/treehelpers.py %%PYTHON_SITELIBDIR%%/meld/ui/__init__.py %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/bufferselectors.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/cellrenderers.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/filechooser.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% +%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listselector.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/meld/ui/bufferselectors.py +%%PYTHON_SITELIBDIR%%/meld/ui/cellrenderers.py %%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.py +%%PYTHON_SITELIBDIR%%/meld/ui/filechooser.py %%PYTHON_SITELIBDIR%%/meld/ui/findbar.py %%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.py %%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.py %%PYTHON_SITELIBDIR%%/meld/ui/gtkcompat.py %%PYTHON_SITELIBDIR%%/meld/ui/historyentry.py +%%PYTHON_SITELIBDIR%%/meld/ui/listselector.py %%PYTHON_SITELIBDIR%%/meld/ui/listwidget.py %%PYTHON_SITELIBDIR%%/meld/ui/msgarea.py %%PYTHON_SITELIBDIR%%/meld/ui/notebook.py %%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.py %%PYTHON_SITELIBDIR%%/meld/ui/statusbar.py %%PYTHON_SITELIBDIR%%/meld/ui/util.py %%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.py %%PYTHON_SITELIBDIR%%/meld/undo.py %%PYTHON_SITELIBDIR%%/meld/vc/COPYING %%PYTHON_SITELIBDIR%%/meld/vc/README %%PYTHON_SITELIBDIR%%/meld/vc/__init__.py %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%% %%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/meld/vc/_null.py %%PYTHON_SITELIBDIR%%/meld/vc/_vc.py %%PYTHON_SITELIBDIR%%/meld/vc/bzr.py %%PYTHON_SITELIBDIR%%/meld/vc/darcs.py %%PYTHON_SITELIBDIR%%/meld/vc/git.py %%PYTHON_SITELIBDIR%%/meld/vc/mercurial.py %%PYTHON_SITELIBDIR%%/meld/vc/svn.py %%PYTHON_SITELIBDIR%%/meld/vcview.py %%PYTHON_SITELIBDIR%%/meld/windowstate.py man/man1/meld.1.gz -share/appdata/meld.appdata.xml -share/applications/meld.desktop +share/applications/org.gnome.meld.desktop 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/icons/HighContrast/scalable/apps/meld.svg +share/icons/HighContrast/scalable/apps/org.gnome.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/16x16/apps/org.gnome.meld.png +share/icons/hicolor/22x22/apps/org.gnome.meld.png +share/icons/hicolor/32x32/apps/org.gnome.meld.png share/icons/hicolor/48x48/apps/meld-version-control.png -share/icons/hicolor/48x48/apps/meld.png -share/icons/hicolor/scalable/apps/meld-figuring-linked.svg -share/icons/hicolor/scalable/apps/meld-figuring.svg -share/icons/hicolor/scalable/apps/meld-unlinking-plus-overlay.svg -share/icons/hicolor/scalable/apps/meld-unlinking.svg -share/icons/hicolor/scalable/apps/meld.svg +share/icons/hicolor/48x48/apps/org.gnome.meld.png +share/icons/hicolor/scalable/apps/org.gnome.meld.svg share/locale/ar/LC_MESSAGES/meld.mo share/locale/bg/LC_MESSAGES/meld.mo share/locale/bs/LC_MESSAGES/meld.mo share/locale/ca/LC_MESSAGES/meld.mo share/locale/ca@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/sk/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@latin/LC_MESSAGES/meld.mo share/locale/sv/LC_MESSAGES/meld.mo share/locale/tr/LC_MESSAGES/meld.mo share/locale/uk/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/vc-add-24.png %%DATADIR%%/icons/vc-checkout-24.png %%DATADIR%%/icons/vc-commit-24.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%%/styles/meld-base.xml %%DATADIR%%/styles/meld-dark.xml %%DATADIR%%/ui/EditableList.ui %%DATADIR%%/ui/application.ui %%DATADIR%%/ui/appmenu-fallback.xml %%DATADIR%%/ui/dirdiff-ui.xml %%DATADIR%%/ui/dirdiff.ui +%%DATADIR%%/ui/encoding-selector.ui %%DATADIR%%/ui/filediff-ui.xml %%DATADIR%%/ui/filediff.ui %%DATADIR%%/ui/findbar.ui +%%DATADIR%%/ui/language-selector.ui %%DATADIR%%/ui/meldapp-ui.xml %%DATADIR%%/ui/meldapp.ui %%DATADIR%%/ui/patch-dialog.ui %%DATADIR%%/ui/preferences.ui %%DATADIR%%/ui/shortcuts.ui %%DATADIR%%/ui/tab-placeholder.ui %%DATADIR%%/ui/vcview-ui.xml %%DATADIR%%/ui/vcview.ui -share/mime/packages/meld.xml +share/metainfo/org.gnome.meld.appdata.xml +share/mime/packages/org.gnome.meld.xml