24298430 Update meld to version 3.16.1
authorRich Burridge <rich.burridge@oracle.com>
Tue, 19 Jul 2016 10:41:45 -0700
changeset 6430 74bc7531ae5a
parent 6429 cc37c34e43e7
child 6431 e4667e7df088
24298430 Update meld to version 3.16.1
components/meld/Makefile
components/meld/meld.1
components/meld/meld.license
components/meld/meld.p5m
components/meld/patches/INSTALL.patch
components/meld/patches/meld.patch
--- a/components/meld/Makefile	Mon Jul 18 14:25:52 2016 -0700
+++ b/components/meld/Makefile	Tue Jul 19 10:41:45 2016 -0700
@@ -26,27 +26,29 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		meld
-COMPONENT_VERSION=	1.8.6
-COMPONENT_PROJECT_URL=	http://meld.sourceforge.net/
+COMPONENT_VERSION=	3.16.1
+COMPONENT_PROJECT_URL=	http://meldmerge.org/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:af96682b8f4bf3ad4221c853b1516218d62a17ff43c38f4a83e7e8ac6736e8a5
+    sha256:1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab
 COMPONENT_ARCHIVE_URL=	http://ftp.gnome.org/pub/gnome/sources/meld/1.8/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_URL=	https://download.gnome.org/sources/$(COMPONENT_NAME)/3.16/$(COMPONENT_ARCHIVE)
 
-TPNO=			21932
+TPNO=			30088
 
-BUILD_STYLE= justmake
+# We just need to build one version.
+PYTHON_VERSIONS =       2.7
+
+BUILD_STYLE= setup.py
 TEST_TARGET= $(NO_TESTS)
 include $(WS_MAKE_RULES)/common.mk
 
-# Needed to find the GNU version of install.
+# Needed to find GNU xgettext.
 PATH =			$(GNUBIN):$(USRBINDIR)
 
 PKG_MACROS +=		PYVER=$(PYTHON_VERSION)
 
-# Meld has no configure however it honors DESTDIR which is necessary so
-# we don't try to install into /usr but rather our proto areas usr
-COMPONENT_INSTALL_ARGS +=	DESTDIR=$(PROTO_DIR)
+PYTHON_DATA =		/usr
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
--- a/components/meld/meld.1	Mon Jul 18 14:25:52 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-'\" t
-.TH meld 1 "18 Nov 2010" "SunOS 5.11" "User Commands"
-.SH NAME
-meld \- graphical diff and merge tool
-.SH SYNOPSIS
-.LP
-.nf
-\fBmeld\fR [\fB--version\fR] [\fB-h\fR] [\fB--help\fR]
-\fBmeld\fR [\fB-aceru\fR] \fIfile\fR
-\fBmeld\fR [\fB-aceru\fR] \fIdir\fR
-\fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIdir\fR \fIdir\fR [\fIdir\fR]
-\fBmeld\fR [\fB-aceru\fR] [\fB--diff\fR] \fIfile\fR \fIfile\fR [\fIfile\fR]
-\fBmeld\fR [\fB...\fR] [\fB-L LABEL,...\fR] [\fB--label=LABEL,...\fR] \fIfile\fR \fIfile\fR [\fIfile\fR]
-.fi
-
-.SH DESCRIPTION
-.LP
-Meld is a graphical diff and merge tool that allows a user to visually compare two or three files simultaneously and edit the files in place. Differences are updated in real-time and highlighted using color coding. Users can also compare two or three directories at a time and launch file comparisons. In addition, users can browse working copies of the code from popular version control systems including CVS, Subversion, Bazaar-ng and Mercurial.
-
-More extensive help information for Meld is included in the graphical interface.
-
-.SH OPTIONS
-.sp
-.ne 2
-.mk
-.na
-\fB\fB--version\fR\fR
-.ad
-.RS 15n
-.rt  
-displays the current version
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-h, --help\fR\fR
-.ad
-.RS 15n
-.rt  
-displays this help information
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-L LABEL, --label=LABEL\fR\fR
-.ad
-.RS 15n
-.rt  
-
-sets the tab label string for a file 
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-a, --auto-compare\fR\fR
-.ad
-.RS 15n
-.rt  
-
-automatically compare all differing files on startup
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-c, --context\fR\fR
-.ad
-.RS 15n
-.rt  
-
-for compatibility with diff command (ignored)
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-e, --ed\fR\fR
-.ad
-.RS 15n
-.rt  
-
-for compatibility with diff command (ignored)
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-r, --recursive\fR\fR
-.ad
-.RS 15n
-.rt  
-
-for compatibility with diff command (ignored)
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-u, --unified\fR\fR
-.ad
-.RS 15n
-.rt  
-
-for compatibility with diff command (ignored)
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-diff\fR\fR
-.ad
-.RS 15n
-.rt  
-
-creates a diff tab for up to three supplied files or directories
-.RE
-
-.SH EXIT STATUS
-.LP
-The following exit values are returned:
-.sp
-.ne 2
-.mk
-.na
-\fB\fB0\fR \fR
-.ad
-.RS 7n
-.rt
-Successful completion.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB>0\fR \fR
-.ad
-.RS 7n
-.rt 
-An error occurred.
-.RE
-.PP
-.SH SEE ALSO
-.LP 
-diff(1), diff3(1)
--- a/components/meld/meld.license	Mon Jul 18 14:25:52 2016 -0700
+++ b/components/meld/meld.license	Tue Jul 19 10:41:45 2016 -0700
@@ -1,13 +1,3 @@
-Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>
-Copyright (C) 2003-2007 Free Software Foundation, Inc.
-Copyright (C) 2003-2005 Miloslav Trmac <[email protected]>
-Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation.
-Copyright (C) 2005 Daniel Thompson <[email protected]>
-Copyright (C) 2005 Ali Afshar <[email protected]>
-Copyright (C) 2005-2006 Gnome i18n Project for Vietnamese.
-Copyright (C) 2006 Ilkka Tuohela <[email protected]>
-
-
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
@@ -348,3 +338,15 @@
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
+
+Copyright (C) 2002-2009 Stephen Kennedy <[email protected]>
+Copyright (C) 2001-2016 Free Software Foundation, Inc.
+Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
+Copyright (C) 2005-2006 Gnome i18n Project for Vietnamese.
+Copyright (C) 2009-2015 Kai Willadsen <[email protected]>
+Copyright (C) 2009-2013 Piotr Piastucki <[email protected]>
+Copyright (C) 2009 Vincent Legoll <[email protected]>
+Copyright (C) 2010 Jesse van den Kieboom
+Copyright (C) 2014 Marco Brito <[email protected]>
+Copyright (C) 2012 Leandro Regueiro
+Copyright (C) 2013-2014 Rosetta Contributors and Canonical Ltd.
--- a/components/meld/meld.p5m	Mon Jul 18 14:25:52 2016 -0700
+++ b/components/meld/meld.p5m	Tue Jul 19 10:41:45 2016 -0700
@@ -18,12 +18,10 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-<transform file hardlink path=usr/lib/.*\.py$ -> default pkg.tmp.pyversion 2.X>
-#
 set name=pkg.fmri \
     value=pkg:/developer/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="meld - graphical diff and merge tool"
@@ -38,80 +36,177 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2008/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/meld \
-    pkg.depend.runpath=/usr/lib/meld:/usr/lib/python$(PYVER):/usr/lib/python$(PYVER)/vendor-packages/gtk-2.0 \
-    pkg.depend.bypass-generate=.*/checker.* \
-    pkg.depend.bypass-generate=.*/gobject.* \
-    pkg.depend.bypass-generate=.*/pychecker/__init__.* \
-    pkg.depend.bypass-generate=.*/pygtk.*
-file path=usr/lib/meld/meld/__init__.py
-file path=usr/lib/meld/meld/dbus_service.py
-file path=usr/lib/meld/meld/diffmap.py
-file path=usr/lib/meld/meld/diffutil.py
-file path=usr/lib/meld/meld/dirdiff.py
-file path=usr/lib/meld/meld/filediff.py
-file path=usr/lib/meld/meld/filemerge.py
-file path=usr/lib/meld/meld/filters.py
-file path=usr/lib/meld/meld/linkmap.py
-file path=usr/lib/meld/meld/matchers.py
-file path=usr/lib/meld/meld/meldapp.py
-file path=usr/lib/meld/meld/meldbuffer.py
-file path=usr/lib/meld/meld/melddoc.py
-file path=usr/lib/meld/meld/meldwindow.py
-file path=usr/lib/meld/meld/merge.py
-file path=usr/lib/meld/meld/misc.py
-file path=usr/lib/meld/meld/newdifftab.py
-file path=usr/lib/meld/meld/patchdialog.py
-file path=usr/lib/meld/meld/paths.py
-file path=usr/lib/meld/meld/preferences.py
-file path=usr/lib/meld/meld/recent.py
-file path=usr/lib/meld/meld/task.py
-file path=usr/lib/meld/meld/test_matchers.py
-file path=usr/lib/meld/meld/tree.py
-file path=usr/lib/meld/meld/ui/__init__.py
-file path=usr/lib/meld/meld/ui/emblemcellrenderer.py
-file path=usr/lib/meld/meld/ui/findbar.py
-file path=usr/lib/meld/meld/ui/gladesupport.py
-file path=usr/lib/meld/meld/ui/gnomeglade.py
-file path=usr/lib/meld/meld/ui/historyentry.py
-file path=usr/lib/meld/meld/ui/listwidget.py
-file path=usr/lib/meld/meld/ui/msgarea.py
-file path=usr/lib/meld/meld/ui/notebooklabel.py
-file path=usr/lib/meld/meld/ui/statusbar.py
-file path=usr/lib/meld/meld/ui/vcdialogs.py
-file path=usr/lib/meld/meld/ui/wraplabel.py
-file path=usr/lib/meld/meld/undo.py
-file path=usr/lib/meld/meld/util/__init__.py
-file path=usr/lib/meld/meld/util/compat.py
-file path=usr/lib/meld/meld/util/prefs.py
-file path=usr/lib/meld/meld/util/sourceviewer.py
-file path=usr/lib/meld/meld/vc/__init__.py
-file path=usr/lib/meld/meld/vc/_null.py
-file path=usr/lib/meld/meld/vc/_vc.py
-file path=usr/lib/meld/meld/vc/bzr.py
-file path=usr/lib/meld/meld/vc/cvs.py
-file path=usr/lib/meld/meld/vc/darcs.py
-file path=usr/lib/meld/meld/vc/fossil.py
-file path=usr/lib/meld/meld/vc/git.py
-file path=usr/lib/meld/meld/vc/mercurial.py
-file path=usr/lib/meld/meld/vc/monotone.py
-file path=usr/lib/meld/meld/vc/svk.py
-file path=usr/lib/meld/meld/vc/svn.py
-file path=usr/lib/meld/meld/vc/svn_17.py
-file path=usr/lib/meld/meld/vcview.py
+file path=usr/bin/meld pkg.depend.bypass-generate=.*/gi.*
+file path=usr/lib/python$(PYVER)/vendor-packages/meld-$(COMPONENT_VERSION)-py$(PYVER).egg-info
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/build_helpers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/conf.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/const.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/diffgrid.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/diffmap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/diffutil.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/dirdiff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/filediff.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/filemerge.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/filters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/gutterrendererchunk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/linkmap.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/matchers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/meldapp.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/meldbuffer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/melddoc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/meldwindow.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/merge.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/misc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/newdifftab.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/patchdialog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/preferences.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/recent.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/settings.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/sourceview.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/task.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/tree.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/emblemcellrenderer.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/findbar.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/gladesupport.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/gnomeglade.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/historyentry.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/listwidget.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/msgarea.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/notebooklabel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/statusbar.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/vcdialogs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/ui/wraplabel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/undo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/util/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/util/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/_null.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/_vc.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/bzr.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/darcs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/git.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/mercurial.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vc/svn.py
+file path=usr/lib/python$(PYVER)/vendor-packages/meld/vcview.py
 file path=usr/share/appdata/meld.appdata.xml
 file path=usr/share/applications/meld.desktop
-file path=usr/share/gnome/help/meld/C/meld.xml
-file path=usr/share/gnome/help/meld/es/meld.xml
-file path=usr/share/gnome/help/meld/fr/meld.xml
+file path=usr/share/glib-2.0/schemas/gschemas.compiled
+file path=usr/share/glib-2.0/schemas/org.gnome.meld.gschema.xml
+file path=usr/share/help/C/meld/command-line.page
+file path=usr/share/help/C/meld/file-changes.page
+file path=usr/share/help/C/meld/file-filters.page
+file path=usr/share/help/C/meld/file-mode.page
+file path=usr/share/help/C/meld/flattened-view.page
+file path=usr/share/help/C/meld/folder-mode.page
+file path=usr/share/help/C/meld/index.page
+file path=usr/share/help/C/meld/introduction.page
+file path=usr/share/help/C/meld/keyboard-shortcuts.page
+file path=usr/share/help/C/meld/legal.xml
+file path=usr/share/help/C/meld/missing-functionality.page
+file path=usr/share/help/C/meld/preferences.page
+file path=usr/share/help/C/meld/resolving-conflicts.page
+file path=usr/share/help/C/meld/text-filters.page
+file path=usr/share/help/C/meld/vc-mode.page
+file path=usr/share/help/C/meld/vc-supported.page
+file path=usr/share/help/cs/meld/command-line.page
+file path=usr/share/help/cs/meld/file-changes.page
+file path=usr/share/help/cs/meld/file-filters.page
+file path=usr/share/help/cs/meld/file-mode.page
+file path=usr/share/help/cs/meld/flattened-view.page
+file path=usr/share/help/cs/meld/folder-mode.page
+file path=usr/share/help/cs/meld/index.page
+file path=usr/share/help/cs/meld/introduction.page
+file path=usr/share/help/cs/meld/keyboard-shortcuts.page
+file path=usr/share/help/cs/meld/legal.xml
+file path=usr/share/help/cs/meld/missing-functionality.page
+file path=usr/share/help/cs/meld/preferences.page
+file path=usr/share/help/cs/meld/resolving-conflicts.page
+file path=usr/share/help/cs/meld/text-filters.page
+file path=usr/share/help/cs/meld/vc-mode.page
+file path=usr/share/help/cs/meld/vc-supported.page
+file path=usr/share/help/de/meld/command-line.page
+file path=usr/share/help/de/meld/file-changes.page
+file path=usr/share/help/de/meld/file-filters.page
+file path=usr/share/help/de/meld/file-mode.page
+file path=usr/share/help/de/meld/flattened-view.page
+file path=usr/share/help/de/meld/folder-mode.page
+file path=usr/share/help/de/meld/index.page
+file path=usr/share/help/de/meld/introduction.page
+file path=usr/share/help/de/meld/keyboard-shortcuts.page
+file path=usr/share/help/de/meld/legal.xml
+file path=usr/share/help/de/meld/missing-functionality.page
+file path=usr/share/help/de/meld/preferences.page
+file path=usr/share/help/de/meld/resolving-conflicts.page
+file path=usr/share/help/de/meld/text-filters.page
+file path=usr/share/help/de/meld/vc-mode.page
+file path=usr/share/help/de/meld/vc-supported.page
+file path=usr/share/help/el/meld/command-line.page
+file path=usr/share/help/el/meld/file-changes.page
+file path=usr/share/help/el/meld/file-filters.page
+file path=usr/share/help/el/meld/file-mode.page
+file path=usr/share/help/el/meld/flattened-view.page
+file path=usr/share/help/el/meld/folder-mode.page
+file path=usr/share/help/el/meld/index.page
+file path=usr/share/help/el/meld/introduction.page
+file path=usr/share/help/el/meld/keyboard-shortcuts.page
+file path=usr/share/help/el/meld/legal.xml
+file path=usr/share/help/el/meld/missing-functionality.page
+file path=usr/share/help/el/meld/preferences.page
+file path=usr/share/help/el/meld/resolving-conflicts.page
+file path=usr/share/help/el/meld/text-filters.page
+file path=usr/share/help/el/meld/vc-mode.page
+file path=usr/share/help/el/meld/vc-supported.page
+file path=usr/share/help/es/meld/command-line.page
+file path=usr/share/help/es/meld/file-changes.page
+file path=usr/share/help/es/meld/file-filters.page
+file path=usr/share/help/es/meld/file-mode.page
+file path=usr/share/help/es/meld/flattened-view.page
+file path=usr/share/help/es/meld/folder-mode.page
+file path=usr/share/help/es/meld/index.page
+file path=usr/share/help/es/meld/introduction.page
+file path=usr/share/help/es/meld/keyboard-shortcuts.page
+file path=usr/share/help/es/meld/legal.xml
+file path=usr/share/help/es/meld/missing-functionality.page
+file path=usr/share/help/es/meld/preferences.page
+file path=usr/share/help/es/meld/resolving-conflicts.page
+file path=usr/share/help/es/meld/text-filters.page
+file path=usr/share/help/es/meld/vc-mode.page
+file path=usr/share/help/es/meld/vc-supported.page
+file path=usr/share/help/sv/meld/command-line.page
+file path=usr/share/help/sv/meld/file-changes.page
+file path=usr/share/help/sv/meld/file-filters.page
+file path=usr/share/help/sv/meld/file-mode.page
+file path=usr/share/help/sv/meld/flattened-view.page
+file path=usr/share/help/sv/meld/folder-mode.page
+file path=usr/share/help/sv/meld/index.page
+file path=usr/share/help/sv/meld/introduction.page
+file path=usr/share/help/sv/meld/keyboard-shortcuts.page
+file path=usr/share/help/sv/meld/legal.xml
+file path=usr/share/help/sv/meld/missing-functionality.page
+file path=usr/share/help/sv/meld/preferences.page
+file path=usr/share/help/sv/meld/resolving-conflicts.page
+file path=usr/share/help/sv/meld/text-filters.page
+file path=usr/share/help/sv/meld/vc-mode.page
+file path=usr/share/help/sv/meld/vc-supported.page
 file path=usr/share/icons/HighContrast/scalable/apps/meld.svg
+file path=usr/share/icons/hicolor/16x16/actions/meld-change-apply-left.png
+file path=usr/share/icons/hicolor/16x16/actions/meld-change-apply-right.png
+file path=usr/share/icons/hicolor/16x16/actions/meld-change-copy.png
+file path=usr/share/icons/hicolor/16x16/actions/meld-change-delete.png
+file path=usr/share/icons/hicolor/16x16/apps/meld-version-control.png
 file path=usr/share/icons/hicolor/16x16/apps/meld.png
 file path=usr/share/icons/hicolor/22x22/apps/meld.png
 file path=usr/share/icons/hicolor/32x32/apps/meld.png
+file path=usr/share/icons/hicolor/48x48/apps/meld-version-control.png
 file path=usr/share/icons/hicolor/48x48/apps/meld.png
+file path=usr/share/icons/hicolor/icon-theme.cache
 file path=usr/share/icons/hicolor/scalable/apps/meld.svg
 file path=usr/share/locale/ar/LC_MESSAGES/meld.mo
 file path=usr/share/locale/bg/LC_MESSAGES/meld.mo
+file path=usr/share/locale/bs/LC_MESSAGES/meld.mo
 file path=usr/share/locale/ca/LC_MESSAGES/meld.mo
 file path=usr/share/locale/[email protected]/LC_MESSAGES/meld.mo
 file path=usr/share/locale/cs/LC_MESSAGES/meld.mo
@@ -127,6 +222,7 @@
 file path=usr/share/locale/fi/LC_MESSAGES/meld.mo
 file path=usr/share/locale/fr/LC_MESSAGES/meld.mo
 file path=usr/share/locale/gl/LC_MESSAGES/meld.mo
+file path=usr/share/locale/he/LC_MESSAGES/meld.mo
 file path=usr/share/locale/hu/LC_MESSAGES/meld.mo
 file path=usr/share/locale/id/LC_MESSAGES/meld.mo
 file path=usr/share/locale/it/LC_MESSAGES/meld.mo
@@ -143,38 +239,35 @@
 file path=usr/share/locale/ro/LC_MESSAGES/meld.mo
 file path=usr/share/locale/ru/LC_MESSAGES/meld.mo
 file path=usr/share/locale/rw/LC_MESSAGES/meld.mo
+file path=usr/share/locale/sk/LC_MESSAGES/meld.mo
 file path=usr/share/locale/sl/LC_MESSAGES/meld.mo
 file path=usr/share/locale/sq/LC_MESSAGES/meld.mo
 file path=usr/share/locale/sr/LC_MESSAGES/meld.mo
 file path=usr/share/locale/[email protected]/LC_MESSAGES/meld.mo
 file path=usr/share/locale/sv/LC_MESSAGES/meld.mo
+file path=usr/share/locale/tr/LC_MESSAGES/meld.mo
 file path=usr/share/locale/vi/LC_MESSAGES/meld.mo
 file path=usr/share/locale/zh_CN/LC_MESSAGES/meld.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/meld.mo
-file meld.1 path=usr/share/man/man1/meld.1
-file path=usr/share/meld/gtkrc
-file path=usr/share/meld/icons/button_apply0.xpm
-file path=usr/share/meld/icons/button_apply1.xpm
-file path=usr/share/meld/icons/button_copy0.xpm
-file path=usr/share/meld/icons/button_copy1.xpm
-file path=usr/share/meld/icons/button_delete.xpm
+file path=usr/share/man/man1/meld.1
 file path=usr/share/meld/icons/emblem-meld-newer-file.png
 file path=usr/share/meld/icons/filter-ignored-24.png
 file path=usr/share/meld/icons/filter-modified-24.png
 file path=usr/share/meld/icons/filter-nonvc-24.png
 file path=usr/share/meld/icons/filter-normal-24.png
-file path=usr/share/meld/icons/meld-locked.png
-file path=usr/share/meld/icons/meld-unlocked.png
-file path=usr/share/meld/icons/meld-vc-icon.png
 file path=usr/share/meld/icons/vc-add-24.png
 file path=usr/share/meld/icons/vc-checkout-24.png
 file path=usr/share/meld/icons/vc-commit-24.png
-file path=usr/share/meld/icons/vc-icon.png
 file path=usr/share/meld/icons/vc-push-24.png
 file path=usr/share/meld/icons/vc-remove-24.png
 file path=usr/share/meld/icons/vc-resolve-24.png
 file path=usr/share/meld/icons/vc-update-24.png
+file path=usr/share/meld/meld.css
+file path=usr/share/meld/styles/meld-base.xml
+file path=usr/share/meld/styles/meld-dark.xml
 file path=usr/share/meld/ui/EditableList.ui
+file path=usr/share/meld/ui/application.ui
+file path=usr/share/meld/ui/appmenu-fallback.xml
 file path=usr/share/meld/ui/dirdiff-ui.xml
 file path=usr/share/meld/ui/dirdiff.ui
 file path=usr/share/meld/ui/filediff-ui.xml
@@ -184,11 +277,9 @@
 file path=usr/share/meld/ui/meldapp.ui
 file path=usr/share/meld/ui/patch-dialog.ui
 file path=usr/share/meld/ui/preferences.ui
+file path=usr/share/meld/ui/shortcuts.ui
 file path=usr/share/meld/ui/tab-placeholder.ui
 file path=usr/share/meld/ui/vcview-ui.xml
 file path=usr/share/meld/ui/vcview.ui
 file path=usr/share/mime/packages/meld.xml
-file path=usr/share/omf/meld/meld-C.omf
-file path=usr/share/omf/meld/meld-es.omf
-file path=usr/share/omf/meld/meld-fr.omf
 license meld.license license=GPLv2
--- a/components/meld/patches/INSTALL.patch	Mon Jul 18 14:25:52 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-This patch originated in-house but is not suitable for upstream.
-
---- meld-1.8.6/INSTALL.orig	2015-03-13 11:10:19.822910199 -0700
-+++ meld-1.8.6/INSTALL	2015-03-13 11:10:40.322859285 -0700
[email protected]@ -33,8 +33,8 @@
- ## 
- ## If you need to, you can customise the install paths used here:
- ##
--PYTHON ?= python
--prefix := /usr/local
-+PYTHON ?= python2.7
-+prefix := /usr
- bindir := $(prefix)/bin
- libdir := $(prefix)/lib
- docdir := $(prefix)/share/doc
--- a/components/meld/patches/meld.patch	Mon Jul 18 14:25:52 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-This patch originated in-house but is not suitable for upstream.
-
---- meld-1.8.6/bin/meld.orig	2015-03-13 11:51:14.350881777 -0700
-+++ meld-1.8.6/bin/meld	2015-03-13 11:51:32.147493127 -0700
[email protected]@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2.7
- 
- ### Copyright (C) 2002-2006 Stephen Kennedy <[email protected]>
-