# HG changeset patch
# User Jay Cotton <Jay.Cotton@Oracle.com>
# Date 1474096249 25200
# Node ID bc003d56ef5acebc4b53d14d25846a9e71fbcb1c
# Parent  6688ad419cab3e834dfdcce7a005bbe6f7d7b1ac
23245359 Move vinagre to Userland and update to 3.16.0
22144775 problem in GNOME/REMOTE-DESKTOP

diff -r 6688ad419cab -r bc003d56ef5a components/gnome/vinagre/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/vinagre/Makefile	Sat Sep 17 00:10:49 2016 -0700
@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=	    	64
+COMPILER=      	       	gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		vinagre
+COMPONENT_VERSION=	3.16.0
+COMPONENT_PROJECT_URL=  https://wiki.gnome.org/Projects//$(COMPONENT_NAME)
+COMPONENT_ARCHIVE_HASH= \
+	sha256:93d79e18e71509647fe4bc00a0dcef5382b2e3a79c39d2b18a91334195995c34
+COMPONENT_BUGDB=	gnome/remote-desktop
+
+TPNO=			26597
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Needs updated glib2, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+# Requires XPG4 or later & C99 compatibility, thus XPG6 or later
+CFLAGS += $(XPG6MODE)
+
+# Assumes GNU versions of utilities in PATH (e.g. xgettext).
+CONFIGURE_ENV += PATH="$(GNUBIN):$(PATH)"
+COMPONENT_BUILD_ENV += PATH="$(GNUBIN):$(PATH)"
+
+# RDP support requires freerdp
+CONFIGURE_OPTIONS += --disable-rdp
+CONFIGURE_OPTIONS += --with-telepathy=yes
+
+# Delete this when build servers are installed with an updated gtk-vnc
+GTKVNC_BASE = $(WS_COMPONENTS)/gnome/gtk-vnc/build/prototype/$(MACH)
+PKG_CONFIG_PATHS += $(GTKVNC_BASE)$(PKG_CONFIG_PATH.$(BITS))
+
+LD_OPTIONS += -L $(GTKVNC_BASE)$(USRLIB.$(BITS))
+
+CONFIGURE_ENV += VNC_CFLAGS="-DMESA_EGL_NO_X11_HEADERS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -I$(GTKVNC_BASE)/usr/include/gtk-vnc-2.0 -I$(GTKVNC_BASE)/usr/include/gvnc-1.0 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/$(MACH64)/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng14 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng14 -I/usr/include/glib-2.0 -I/usr/lib/$(MACH64)/glib-2.0/include -I/usr/include/libxml2"
+
+# The dependency isn't installed, so add it manually since pkgdepend
+# can't resolve them yet: 15708323
+DEPENDED += $(WS_TOP)/components/gnome/gtk-vnc/build/manifest-$(MACH)-gtk-vnc.depend
+
+# Temporary until dependencies are all on build machines
+REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../gtk-vnc/Makefile)
+#end Delete
+
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gdk-pixbuf
+REQUIRED_PACKAGES += library/desktop/gtk-vnc
+REQUIRED_PACKAGES += library/desktop/gtk3
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gnome/libsecret
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/telepathy-glib
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/libdbus-glib
diff -r 6688ad419cab -r bc003d56ef5a components/gnome/vinagre/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/vinagre/depend.mk	Sat Sep 17 00:10:49 2016 -0700
@@ -0,0 +1,1 @@
+gnome/vinagre: gnome/gtk-vnc
diff -r 6688ad419cab -r bc003d56ef5a components/gnome/vinagre/vinagre.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/vinagre/vinagre.p5m	Sat Sep 17 00:10:49 2016 -0700
@@ -0,0 +1,393 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+set name=pkg.fmri \
+    value=pkg:/desktop/remote-desktop/vinagre@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="A VNC client for the GNOME Desktop"
+set name=com.oracle.info.description value="A VNC client for the GNOME Desktop"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/708
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/vinagre
+file path=usr/share/GConf/gsettings/org.gnome.Vinagre.convert
+file path=usr/share/appdata/vinagre.appdata.xml
+file path=usr/share/applications/vinagre-file.desktop
+file path=usr/share/applications/vinagre.desktop
+file path=usr/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
+file path=usr/share/glib-2.0/schemas/org.gnome.Vinagre.gschema.xml
+file path=usr/share/help/C/vinagre/connect-file.page
+file path=usr/share/help/C/vinagre/connect-reverse.page
+file path=usr/share/help/C/vinagre/connect.page
+file path=usr/share/help/C/vinagre/figures/preferences-desktop-remote-desktop.png
+file path=usr/share/help/C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/C/vinagre/fullscreen.page
+file path=usr/share/help/C/vinagre/index.page
+file path=usr/share/help/C/vinagre/introduction.page
+file path=usr/share/help/C/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/C/vinagre/legal.xml
+file path=usr/share/help/C/vinagre/scaling.page
+file path=usr/share/help/C/vinagre/take-screenshot.page
+file path=usr/share/help/C/vinagre/view-only.page
+file path=usr/share/help/cs/vinagre/connect-file.page
+file path=usr/share/help/cs/vinagre/connect-reverse.page
+file path=usr/share/help/cs/vinagre/connect.page
+link \
+    path=usr/share/help/cs/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/cs/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/cs/vinagre/fullscreen.page
+file path=usr/share/help/cs/vinagre/index.page
+file path=usr/share/help/cs/vinagre/introduction.page
+file path=usr/share/help/cs/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/cs/vinagre/legal.xml
+file path=usr/share/help/cs/vinagre/scaling.page
+file path=usr/share/help/cs/vinagre/take-screenshot.page
+file path=usr/share/help/cs/vinagre/view-only.page
+file path=usr/share/help/de/vinagre/connect-file.page
+file path=usr/share/help/de/vinagre/connect-reverse.page
+file path=usr/share/help/de/vinagre/connect.page
+link \
+    path=usr/share/help/de/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/de/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/de/vinagre/fullscreen.page
+file path=usr/share/help/de/vinagre/index.page
+file path=usr/share/help/de/vinagre/introduction.page
+file path=usr/share/help/de/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/de/vinagre/legal.xml
+file path=usr/share/help/de/vinagre/scaling.page
+file path=usr/share/help/de/vinagre/take-screenshot.page
+file path=usr/share/help/de/vinagre/view-only.page
+file path=usr/share/help/el/vinagre/connect-file.page
+file path=usr/share/help/el/vinagre/connect-reverse.page
+file path=usr/share/help/el/vinagre/connect.page
+link \
+    path=usr/share/help/el/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/el/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/el/vinagre/fullscreen.page
+file path=usr/share/help/el/vinagre/index.page
+file path=usr/share/help/el/vinagre/introduction.page
+file path=usr/share/help/el/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/el/vinagre/legal.xml
+file path=usr/share/help/el/vinagre/scaling.page
+file path=usr/share/help/el/vinagre/take-screenshot.page
+file path=usr/share/help/el/vinagre/view-only.page
+file path=usr/share/help/es/vinagre/connect-file.page
+file path=usr/share/help/es/vinagre/connect-reverse.page
+file path=usr/share/help/es/vinagre/connect.page
+link \
+    path=usr/share/help/es/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/es/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/es/vinagre/fullscreen.page
+file path=usr/share/help/es/vinagre/index.page
+file path=usr/share/help/es/vinagre/introduction.page
+file path=usr/share/help/es/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/es/vinagre/legal.xml
+file path=usr/share/help/es/vinagre/scaling.page
+file path=usr/share/help/es/vinagre/take-screenshot.page
+file path=usr/share/help/es/vinagre/view-only.page
+file path=usr/share/help/eu/vinagre/connect-file.page
+file path=usr/share/help/eu/vinagre/connect-reverse.page
+file path=usr/share/help/eu/vinagre/connect.page
+link \
+    path=usr/share/help/eu/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/eu/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/eu/vinagre/fullscreen.page
+file path=usr/share/help/eu/vinagre/index.page
+file path=usr/share/help/eu/vinagre/introduction.page
+file path=usr/share/help/eu/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/eu/vinagre/legal.xml
+file path=usr/share/help/eu/vinagre/scaling.page
+file path=usr/share/help/eu/vinagre/take-screenshot.page
+file path=usr/share/help/eu/vinagre/view-only.page
+file path=usr/share/help/fa/vinagre/connect-file.page
+file path=usr/share/help/fa/vinagre/connect-reverse.page
+file path=usr/share/help/fa/vinagre/connect.page
+link \
+    path=usr/share/help/fa/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/fa/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/fa/vinagre/fullscreen.page
+file path=usr/share/help/fa/vinagre/index.page
+file path=usr/share/help/fa/vinagre/introduction.page
+file path=usr/share/help/fa/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/fa/vinagre/legal.xml
+file path=usr/share/help/fa/vinagre/scaling.page
+file path=usr/share/help/fa/vinagre/take-screenshot.page
+file path=usr/share/help/fa/vinagre/view-only.page
+file path=usr/share/help/fr/vinagre/connect-file.page
+file path=usr/share/help/fr/vinagre/connect-reverse.page
+file path=usr/share/help/fr/vinagre/connect.page
+link \
+    path=usr/share/help/fr/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/fr/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/fr/vinagre/fullscreen.page
+file path=usr/share/help/fr/vinagre/index.page
+file path=usr/share/help/fr/vinagre/introduction.page
+file path=usr/share/help/fr/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/fr/vinagre/legal.xml
+file path=usr/share/help/fr/vinagre/scaling.page
+file path=usr/share/help/fr/vinagre/take-screenshot.page
+file path=usr/share/help/fr/vinagre/view-only.page
+file path=usr/share/help/gl/vinagre/connect-file.page
+file path=usr/share/help/gl/vinagre/connect-reverse.page
+file path=usr/share/help/gl/vinagre/connect.page
+link \
+    path=usr/share/help/gl/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/gl/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/gl/vinagre/fullscreen.page
+file path=usr/share/help/gl/vinagre/index.page
+file path=usr/share/help/gl/vinagre/introduction.page
+file path=usr/share/help/gl/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/gl/vinagre/legal.xml
+file path=usr/share/help/gl/vinagre/scaling.page
+file path=usr/share/help/gl/vinagre/take-screenshot.page
+file path=usr/share/help/gl/vinagre/view-only.page
+file path=usr/share/help/hu/vinagre/connect-file.page
+file path=usr/share/help/hu/vinagre/connect-reverse.page
+file path=usr/share/help/hu/vinagre/connect.page
+link \
+    path=usr/share/help/hu/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/hu/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/hu/vinagre/fullscreen.page
+file path=usr/share/help/hu/vinagre/index.page
+file path=usr/share/help/hu/vinagre/introduction.page
+file path=usr/share/help/hu/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/hu/vinagre/legal.xml
+file path=usr/share/help/hu/vinagre/scaling.page
+file path=usr/share/help/hu/vinagre/take-screenshot.page
+file path=usr/share/help/hu/vinagre/view-only.page
+file path=usr/share/help/id/vinagre/connect-file.page
+file path=usr/share/help/id/vinagre/connect-reverse.page
+file path=usr/share/help/id/vinagre/connect.page
+link \
+    path=usr/share/help/id/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/id/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/id/vinagre/fullscreen.page
+file path=usr/share/help/id/vinagre/index.page
+file path=usr/share/help/id/vinagre/introduction.page
+file path=usr/share/help/id/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/id/vinagre/legal.xml
+file path=usr/share/help/id/vinagre/scaling.page
+file path=usr/share/help/id/vinagre/take-screenshot.page
+file path=usr/share/help/id/vinagre/view-only.page
+file path=usr/share/help/lv/vinagre/connect-file.page
+file path=usr/share/help/lv/vinagre/connect-reverse.page
+file path=usr/share/help/lv/vinagre/connect.page
+link \
+    path=usr/share/help/lv/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/lv/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/lv/vinagre/fullscreen.page
+file path=usr/share/help/lv/vinagre/index.page
+file path=usr/share/help/lv/vinagre/introduction.page
+file path=usr/share/help/lv/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/lv/vinagre/legal.xml
+file path=usr/share/help/lv/vinagre/scaling.page
+file path=usr/share/help/lv/vinagre/take-screenshot.page
+file path=usr/share/help/lv/vinagre/view-only.page
+file path=usr/share/help/pt_BR/vinagre/connect-file.page
+file path=usr/share/help/pt_BR/vinagre/connect-reverse.page
+file path=usr/share/help/pt_BR/vinagre/connect.page
+link \
+    path=usr/share/help/pt_BR/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/pt_BR/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/pt_BR/vinagre/fullscreen.page
+file path=usr/share/help/pt_BR/vinagre/index.page
+file path=usr/share/help/pt_BR/vinagre/introduction.page
+file path=usr/share/help/pt_BR/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/pt_BR/vinagre/legal.xml
+file path=usr/share/help/pt_BR/vinagre/scaling.page
+file path=usr/share/help/pt_BR/vinagre/take-screenshot.page
+file path=usr/share/help/pt_BR/vinagre/view-only.page
+file path=usr/share/help/ru/vinagre/connect-file.page
+file path=usr/share/help/ru/vinagre/connect-reverse.page
+file path=usr/share/help/ru/vinagre/connect.page
+link \
+    path=usr/share/help/ru/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/ru/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/ru/vinagre/fullscreen.page
+file path=usr/share/help/ru/vinagre/index.page
+file path=usr/share/help/ru/vinagre/introduction.page
+file path=usr/share/help/ru/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/ru/vinagre/legal.xml
+file path=usr/share/help/ru/vinagre/scaling.page
+file path=usr/share/help/ru/vinagre/take-screenshot.page
+file path=usr/share/help/ru/vinagre/view-only.page
+file path=usr/share/help/sl/vinagre/connect-file.page
+file path=usr/share/help/sl/vinagre/connect-reverse.page
+file path=usr/share/help/sl/vinagre/connect.page
+link \
+    path=usr/share/help/sl/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/sl/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/sl/vinagre/fullscreen.page
+file path=usr/share/help/sl/vinagre/index.page
+file path=usr/share/help/sl/vinagre/introduction.page
+file path=usr/share/help/sl/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/sl/vinagre/legal.xml
+file path=usr/share/help/sl/vinagre/scaling.page
+file path=usr/share/help/sl/vinagre/take-screenshot.page
+file path=usr/share/help/sl/vinagre/view-only.page
+file path=usr/share/help/zh_CN/vinagre/connect-file.page
+file path=usr/share/help/zh_CN/vinagre/connect-reverse.page
+file path=usr/share/help/zh_CN/vinagre/connect.page
+link \
+    path=usr/share/help/zh_CN/vinagre/figures/preferences-desktop-remote-desktop.png \
+    target=../../../C/vinagre/figures/preferences-desktop-remote-desktop.png
+link path=usr/share/help/zh_CN/vinagre/figures/vinagre-connected-3-16.png \
+    target=../../../C/vinagre/figures/vinagre-connected-3-16.png
+file path=usr/share/help/zh_CN/vinagre/fullscreen.page
+file path=usr/share/help/zh_CN/vinagre/index.page
+file path=usr/share/help/zh_CN/vinagre/introduction.page
+file path=usr/share/help/zh_CN/vinagre/keyboard-shortcuts.page
+file path=usr/share/help/zh_CN/vinagre/legal.xml
+file path=usr/share/help/zh_CN/vinagre/scaling.page
+file path=usr/share/help/zh_CN/vinagre/take-screenshot.page
+file path=usr/share/help/zh_CN/vinagre/view-only.page
+file path=usr/share/icons/hicolor/16x16/mimetypes/application-x-remote-connection.png
+file path=usr/share/icons/hicolor/16x16/mimetypes/application-x-vnc.png
+file path=usr/share/icons/hicolor/16x16/status/view-minimize.png
+file path=usr/share/icons/hicolor/22x22/mimetypes/application-x-remote-connection.png
+file path=usr/share/icons/hicolor/22x22/mimetypes/application-x-vnc.png
+file path=usr/share/icons/hicolor/22x22/status/view-minimize.png
+file path=usr/share/icons/hicolor/24x24/mimetypes/application-x-remote-connection.png
+file path=usr/share/icons/hicolor/24x24/mimetypes/application-x-vnc.png
+file path=usr/share/icons/hicolor/32x32/mimetypes/application-x-remote-connection.png
+file path=usr/share/icons/hicolor/32x32/mimetypes/application-x-vnc.png
+file path=usr/share/icons/hicolor/32x32/status/view-minimize.png
+file path=usr/share/icons/hicolor/48x48/mimetypes/application-x-remote-connection.png
+file path=usr/share/icons/hicolor/48x48/mimetypes/application-x-vnc.png
+file path=usr/share/icons/hicolor/48x48/status/view-minimize.png
+file path=usr/share/icons/hicolor/scalable/mimetypes/application-x-remote-connection.svg
+file path=usr/share/icons/hicolor/scalable/mimetypes/application-x-vnc.svg
+file path=usr/share/locale/ar/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/as/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ast/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/be/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/be@latin/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/bg/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/bn/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/bs/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ca/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ca@valencia/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/cs/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/da/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/de/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/el/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/en@shaw/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/eo/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/es/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/et/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/eu/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/fa/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/fi/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/fr/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ga/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/gl/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/gu/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/he/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/hi/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/hu/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/id/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/it/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ja/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/kk/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/kn/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ko/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ku/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/lt/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/lv/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/mai/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/mk/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ml/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/mr/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ms/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/nb/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ne/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/nl/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/nn/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/oc/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/or/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/pa/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/pl/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/pt/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ro/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ru/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/si/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/sk/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/sl/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/sq/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/sr/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/sr@latin/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/sv/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ta/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/te/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/tg/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/th/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/tr/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/ug/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/uk/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/vi/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/vinagre.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/vinagre.mo
+file path=usr/share/man/man1/vinagre.1
+file path=usr/share/mime/packages/vinagre-mime.xml
+file path=usr/share/telepathy/clients/Vinagre.client
+file path=usr/share/vinagre/vinagre-ui.xml
+file path=usr/share/vinagre/vinagre.ui
+license COPYING license=GPLv3
diff -r 6688ad419cab -r bc003d56ef5a components/meta-packages/incorporation-cache
--- a/components/meta-packages/incorporation-cache	Fri Sep 16 23:00:48 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Sat Sep 17 00:10:49 2016 -0700
@@ -68,7 +68,6 @@
 consolidation/userland/userland-incorporation:desktop/cd-burning/brasero@2.30.3-5.12.0.0.0.92.0
 consolidation/userland/userland-incorporation:desktop/gksu@2.0.2-5.12.0.0.0.92.0
 consolidation/userland/userland-incorporation:desktop/remote-desktop/rdesktop@1.6.0-5.12.0.0.0.92.0
-consolidation/userland/userland-incorporation:desktop/remote-desktop/vinagre@2.30.3-5.12.0.0.0.90.0
 consolidation/userland/userland-incorporation:developer/ui-designer/glade@3.6.7-5.12.0.0.0.92.0
 consolidation/userland/userland-incorporation:gnome/accessibility/accerciser@1.10.1-5.12.0.0.0.92.0
 consolidation/userland/userland-incorporation:gnome/accessibility/orca@2.30.2-5.12.0.0.0.92.0