--- a/components/meld/meld.p5m Fri Apr 14 13:50:30 2017 -0700
+++ b/components/meld/meld.p5m Fri Apr 14 13:54:40 2017 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -38,239 +38,157 @@
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)
-dir path=usr
-dir path=usr/bin
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.*
-dir path=usr/lib
-dir path=usr/lib/meld
-dir path=usr/lib/meld/meld
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
-dir path=usr/lib/meld/meld/ui
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
-dir path=usr/lib/meld/meld/util
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
-dir path=usr/lib/meld/meld/vc
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/cdv.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/rcs.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/tla.py
+file path=usr/lib/meld/meld/vc/svn_17.py
file path=usr/lib/meld/meld/vcview.py
-dir path=usr/share
-dir path=usr/share/applications
+file path=usr/share/appdata/meld.appdata.xml
file path=usr/share/applications/meld.desktop
-dir path=usr/share/gnome group=other
-dir path=usr/share/gnome/help
-dir path=usr/share/gnome/help/meld
-dir path=usr/share/gnome/help/meld/C
file path=usr/share/gnome/help/meld/C/meld.xml
-dir path=usr/share/gnome/help/meld/es
file path=usr/share/gnome/help/meld/es/meld.xml
-dir path=usr/share/gnome/help/meld/fr
file path=usr/share/gnome/help/meld/fr/meld.xml
-dir path=usr/share/icons
-dir path=usr/share/icons/hicolor
-dir path=usr/share/icons/hicolor/16x16
-dir path=usr/share/icons/hicolor/16x16/apps
+file path=usr/share/icons/HighContrast/scalable/apps/meld.svg
file path=usr/share/icons/hicolor/16x16/apps/meld.png
-dir path=usr/share/icons/hicolor/22x22
-dir path=usr/share/icons/hicolor/22x22/apps
file path=usr/share/icons/hicolor/22x22/apps/meld.png
-dir path=usr/share/icons/hicolor/32x32
-dir path=usr/share/icons/hicolor/32x32/apps
file path=usr/share/icons/hicolor/32x32/apps/meld.png
-dir path=usr/share/icons/hicolor/48x48
-dir path=usr/share/icons/hicolor/48x48/apps
file path=usr/share/icons/hicolor/48x48/apps/meld.png
-dir path=usr/share/icons/hicolor/scalable
-dir path=usr/share/icons/hicolor/scalable/apps
file path=usr/share/icons/hicolor/scalable/apps/meld.svg
-dir path=usr/share/locale
-dir path=usr/share/locale/ar
-dir path=usr/share/locale/ar/LC_MESSAGES
file path=usr/share/locale/ar/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/bg
-dir path=usr/share/locale/bg/LC_MESSAGES
file path=usr/share/locale/bg/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/ca
-dir path=usr/share/locale/ca/LC_MESSAGES
file path=usr/share/locale/ca/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/cs
-dir path=usr/share/locale/cs/LC_MESSAGES
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/meld.mo
file path=usr/share/locale/cs/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
+file path=usr/share/locale/da/LC_MESSAGES/meld.mo
file path=usr/share/locale/de/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/dz
-dir path=usr/share/locale/dz/LC_MESSAGES
file path=usr/share/locale/dz/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/el
-dir path=usr/share/locale/el/LC_MESSAGES
file path=usr/share/locale/el/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/en_CA
-dir path=usr/share/locale/en_CA/LC_MESSAGES
file path=usr/share/locale/en_CA/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/en_GB
-dir path=usr/share/locale/en_GB/LC_MESSAGES
file path=usr/share/locale/en_GB/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
+file path=usr/share/locale/eo/LC_MESSAGES/meld.mo
file path=usr/share/locale/es/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
+file path=usr/share/locale/eu/LC_MESSAGES/meld.mo
file path=usr/share/locale/fi/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
file path=usr/share/locale/fr/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/gl
-dir path=usr/share/locale/gl/LC_MESSAGES
file path=usr/share/locale/gl/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/hu
-dir path=usr/share/locale/hu/LC_MESSAGES
file path=usr/share/locale/hu/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
+file path=usr/share/locale/id/LC_MESSAGES/meld.mo
file path=usr/share/locale/it/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
file path=usr/share/locale/ja/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/ko
-dir path=usr/share/locale/ko/LC_MESSAGES
file path=usr/share/locale/ko/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/nb
-dir path=usr/share/locale/nb/LC_MESSAGES
file path=usr/share/locale/nb/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/ne
-dir path=usr/share/locale/ne/LC_MESSAGES
file path=usr/share/locale/ne/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
file path=usr/share/locale/nl/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/oc
-dir path=usr/share/locale/oc/LC_MESSAGES
file path=usr/share/locale/oc/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/pa
-dir path=usr/share/locale/pa/LC_MESSAGES
file path=usr/share/locale/pa/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/pt
-dir path=usr/share/locale/pt/LC_MESSAGES
+file path=usr/share/locale/pl/LC_MESSAGES/meld.mo
file path=usr/share/locale/pt/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/pt_BR
-dir path=usr/share/locale/pt_BR/LC_MESSAGES
file path=usr/share/locale/pt_BR/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
+file path=usr/share/locale/ro/LC_MESSAGES/meld.mo
file path=usr/share/locale/ru/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/rw
-dir path=usr/share/locale/rw/LC_MESSAGES
file path=usr/share/locale/rw/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/sl
-dir path=usr/share/locale/sl/LC_MESSAGES
file path=usr/share/locale/sl/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/sq
-dir path=usr/share/locale/sq/LC_MESSAGES
file path=usr/share/locale/sq/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/sr
-dir path=usr/share/locale/sr/LC_MESSAGES
file path=usr/share/locale/sr/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/sr@latin
-dir path=usr/share/locale/sr@latin/LC_MESSAGES
file path=usr/share/locale/sr@latin/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/sv/LC_MESSAGES
file path=usr/share/locale/sv/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/vi
-dir path=usr/share/locale/vi/LC_MESSAGES
file path=usr/share/locale/vi/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/zh_CN
-dir path=usr/share/locale/zh_CN/LC_MESSAGES
file path=usr/share/locale/zh_CN/LC_MESSAGES/meld.mo
-dir path=usr/share/locale/zh_TW
-dir path=usr/share/locale/zh_TW/LC_MESSAGES
file path=usr/share/locale/zh_TW/LC_MESSAGES/meld.mo
-dir path=usr/share/man
-dir path=usr/share/man/man1
file meld.1 path=usr/share/man/man1/meld.1
-dir path=usr/share/meld
-dir path=usr/share/meld/icons
+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/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/icon.png
-file path=usr/share/meld/icons/tree-file-changed.png
-file path=usr/share/meld/icons/tree-file-missing.png
-file path=usr/share/meld/icons/tree-file-new.png
-file path=usr/share/meld/icons/tree-file-newer.png
-file path=usr/share/meld/icons/tree-file-normal.png
-file path=usr/share/meld/icons/tree-folder-changed.png
-file path=usr/share/meld/icons/tree-folder-missing.png
-file path=usr/share/meld/icons/tree-folder-new.png
-file path=usr/share/meld/icons/tree-folder-normal.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
-dir path=usr/share/meld/ui
+file path=usr/share/meld/ui/EditableList.ui
file path=usr/share/meld/ui/dirdiff-ui.xml
-file path=usr/share/meld/ui/dirdiff.glade
+file path=usr/share/meld/ui/dirdiff.ui
file path=usr/share/meld/ui/filediff-ui.xml
-file path=usr/share/meld/ui/filediff.glade
-file path=usr/share/meld/ui/findbar.glade
+file path=usr/share/meld/ui/filediff.ui
+file path=usr/share/meld/ui/findbar.ui
file path=usr/share/meld/ui/meldapp-ui.xml
-file path=usr/share/meld/ui/meldapp.glade
-file path=usr/share/meld/ui/preferences.glade
+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/tab-placeholder.ui
file path=usr/share/meld/ui/vcview-ui.xml
-file path=usr/share/meld/ui/vcview.glade
-dir path=usr/share/omf
-dir path=usr/share/omf/meld
+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
-dir path=usr/share/pixmaps
-file path=usr/share/pixmaps/meld.png
license meld.license license=GPLv2