#
# 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.
#

#
# This file specifies additional packages to be included when the
# userland-incorporator runs to generate incorporations, to allow packages
# which were not built in the Userland gate to be incorporated.
#
# Adding packages to this file should be a very rare occasion discussed
# first with the gatekeepers, generally only for special cases like merging
# consolidations or special builds that cannot be part of the main Userland
# gate build for some reason.
#
# Packages should be removed from this file when they are integrated to the
# normal Userland gate builds.
#
# lines are in the format:
#    incorporation-name:package@version=i386
# (=i386) is optional value and it means that the record is for i386 only
# lines begining with hash (#) are ignored
#

#
# The following packages are part of the Desktop consolidation merge to the
# Userland gate, and will be removed as the packages are either integrated
# to the build or replaced by a package rename/obsolete in the history file.
#
consolidation/desktop/desktop-incorporation:codec/[email protected]
consolidation/desktop/desktop-incorporation:codec/[email protected]
consolidation/desktop/desktop-incorporation:codec/[email protected]
consolidation/desktop/desktop-incorporation:codec/[email protected]
consolidation/desktop/desktop-incorporation:communication/conferencing/[email protected],5.11-0.175.3.9.0.3.0
consolidation/desktop/desktop-incorporation:communication/im/[email protected]
consolidation/desktop/desktop-incorporation:communication/pda/[email protected]
consolidation/desktop/desktop-incorporation:communication/pda/[email protected]
consolidation/desktop/desktop-incorporation:data/docbook/[email protected]
consolidation/desktop/desktop-incorporation:data/docbook/[email protected]
consolidation/desktop/desktop-incorporation:data/docbook/[email protected]
consolidation/desktop/desktop-incorporation:data/[email protected]
consolidation/desktop/desktop-incorporation:data/[email protected]
consolidation/desktop/desktop-incorporation:data/[email protected]
consolidation/desktop/desktop-incorporation:database/sqlite-3/[email protected],5.11-0.175.3.8.0.2.0
consolidation/desktop/desktop-incorporation:database/[email protected],5.11-0.175.3.8.0.2.0
consolidation/desktop/desktop-incorporation:desktop/administration/[email protected]=i386
consolidation/desktop/desktop-incorporation:desktop/administration/[email protected]
consolidation/desktop/desktop-incorporation:desktop/archive-manager/[email protected]
consolidation/desktop/desktop-incorporation:desktop/[email protected]=i386
consolidation/desktop/desktop-incorporation:desktop/calculator/[email protected]
consolidation/desktop/desktop-incorporation:desktop/cd-burning/[email protected]
consolidation/desktop/desktop-incorporation:desktop/cd-ripping/[email protected]
consolidation/desktop/desktop-incorporation:desktop/character-map/[email protected]
consolidation/desktop/desktop-incorporation:desktop/compiz/[email protected]=i386
consolidation/desktop/desktop-incorporation:desktop/compiz/library/[email protected]=i386
consolidation/desktop/desktop-incorporation:desktop/compiz/library/[email protected]=i386
consolidation/desktop/desktop-incorporation:desktop/compiz/plugin/[email protected]=i386
consolidation/desktop/desktop-incorporation:desktop/compiz/plugin/[email protected]=i386
consolidation/desktop/desktop-incorporation:desktop/[email protected]
consolidation/desktop/desktop-incorporation:desktop/file-manager/[email protected]
consolidation/desktop/desktop-incorporation:desktop/[email protected]
consolidation/desktop/desktop-incorporation:desktop/[email protected]
consolidation/desktop/desktop-incorporation:desktop/irc/[email protected]
consolidation/desktop/desktop-incorporation:desktop/network/[email protected]
consolidation/desktop/desktop-incorporation:desktop/pdf-viewer/[email protected]
consolidation/desktop/desktop-incorporation:desktop/project-management/[email protected]
consolidation/desktop/desktop-incorporation:desktop/project-management/[email protected]
consolidation/desktop/desktop-incorporation:desktop/remote-desktop/[email protected]
consolidation/desktop/desktop-incorporation:desktop/remote-desktop/[email protected]
consolidation/desktop/desktop-incorporation:desktop/remote-desktop/[email protected]
consolidation/desktop/desktop-incorporation:desktop/studio/[email protected]
consolidation/desktop/desktop-incorporation:desktop/system-monitor/[email protected]
consolidation/desktop/desktop-incorporation:desktop/system-monitor/[email protected]
consolidation/desktop/desktop-incorporation:desktop/[email protected]
consolidation/desktop/desktop-incorporation:desktop/torrent/[email protected]
consolidation/desktop/desktop-incorporation:desktop/xdg/menu-editor/[email protected]
consolidation/desktop/desktop-incorporation:desktop/xscreensaver/hacks/[email protected]
consolidation/desktop/desktop-incorporation:desktop/xscreensaver/hacks/[email protected]
consolidation/desktop/desktop-incorporation:desktop/xscreensaver/[email protected]
consolidation/desktop/desktop-incorporation:desktop/[email protected]
consolidation/desktop/desktop-incorporation:developer/documentation-tool/[email protected]
consolidation/desktop/desktop-incorporation:developer/documentation-tool/[email protected]
consolidation/desktop/desktop-incorporation:developer/[email protected]
consolidation/desktop/desktop-incorporation:developer/gnome/[email protected]
consolidation/desktop/desktop-incorporation:developer/java/[email protected]
consolidation/desktop/desktop-incorporation:developer/java/[email protected]
consolidation/desktop/desktop-incorporation:developer/lexer/[email protected]
consolidation/desktop/desktop-incorporation:developer/parser/[email protected]
consolidation/desktop/desktop-incorporation:developer/parser/[email protected]
consolidation/desktop/desktop-incorporation:developer/ui-designer/[email protected]
consolidation/desktop/desktop-incorporation:documentation/[email protected]
consolidation/desktop/desktop-incorporation:documentation/gnome/[email protected]
consolidation/desktop/desktop-incorporation:documentation/gnome/[email protected]
consolidation/desktop/desktop-incorporation:editor/blog/[email protected]=i386
consolidation/desktop/desktop-incorporation:editor/diagram/[email protected]
consolidation/desktop/desktop-incorporation:editor/gedit/[email protected]
consolidation/desktop/desktop-incorporation:editor/[email protected]
consolidation/desktop/desktop-incorporation:editor/[email protected]
consolidation/desktop/desktop-incorporation:editor/[email protected]
consolidation/desktop/desktop-incorporation:games/[email protected]
consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
consolidation/desktop/desktop-incorporation:gnome/accessibility/[email protected]
consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
consolidation/desktop/desktop-incorporation:gnome/applet/[email protected]
consolidation/desktop/desktop-incorporation:gnome/config/gconf/[email protected]
consolidation/desktop/desktop-incorporation:gnome/crash-report/[email protected]
consolidation/desktop/desktop-incorporation:gnome/disk-analyzer/[email protected]
consolidation/desktop/desktop-incorporation:gnome/file-manager/nautilus/extension/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:gnome/media/[email protected]
consolidation/desktop/desktop-incorporation:gnome/security/seahorse/[email protected]
consolidation/desktop/desktop-incorporation:gnome/security/[email protected]
consolidation/desktop/desktop-incorporation:gnome/speech/gnome-speech/driver/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/background/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/background/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/cursor/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/cursor/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/sound/[email protected]
consolidation/desktop/desktop-incorporation:gnome/theme/[email protected]
consolidation/desktop/desktop-incorporation:gnome/window-manager/[email protected]
consolidation/desktop/desktop-incorporation:gnome/[email protected]
consolidation/desktop/desktop-incorporation:image/[email protected],5.11-0.175.3.7.0.2.0
consolidation/desktop/desktop-incorporation:image/editor/gimp/[email protected]
consolidation/desktop/desktop-incorporation:image/editor/gimp/plugin/[email protected]
consolidation/desktop/desktop-incorporation:image/editor/[email protected]
consolidation/desktop/desktop-incorporation:image/library/[email protected]
consolidation/desktop/desktop-incorporation:image/library/[email protected]
consolidation/desktop/desktop-incorporation:image/library/[email protected]
consolidation/desktop/desktop-incorporation:image/library/[email protected]
consolidation/desktop/desktop-incorporation:image/library/[email protected]
consolidation/desktop/desktop-incorporation:image/library/[email protected],5.11-0.175.3.10.0.1.0
consolidation/desktop/desktop-incorporation:image/library/[email protected]
consolidation/desktop/desktop-incorporation:image/library/[email protected]
consolidation/desktop/desktop-incorporation:image/[email protected]
consolidation/desktop/desktop-incorporation:image/scanner/[email protected]
consolidation/desktop/desktop-incorporation:image/viewer/eog/[email protected]
consolidation/desktop/desktop-incorporation:image/viewer/[email protected]
consolidation/desktop/desktop-incorporation:image/viewer/[email protected]
consolidation/desktop/desktop-incorporation:image/viewer/[email protected]
consolidation/desktop/desktop-incorporation:image/webcam/[email protected]
consolidation/desktop/desktop-incorporation:library/accessibility/[email protected]
consolidation/desktop/desktop-incorporation:library/audio/gstreamer/plugin/[email protected]
consolidation/desktop/desktop-incorporation:library/audio/[email protected],5.11-0.175.3.7.0.2.0
consolidation/desktop/desktop-incorporation:library/audio/[email protected]
consolidation/desktop/desktop-incorporation:library/c++/[email protected]
consolidation/desktop/desktop-incorporation:library/c++/[email protected]
consolidation/desktop/desktop-incorporation:library/c++/[email protected]
consolidation/desktop/desktop-incorporation:library/c++/[email protected]
consolidation/desktop/desktop-incorporation:library/c++/[email protected]
consolidation/desktop/desktop-incorporation:library/desktop/[email protected]
consolidation/desktop/desktop-incorporation:library/desktop/[email protected]
consolidation/desktop/desktop-incorporation:library/desktop/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/file-monitor/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/java/[email protected]
consolidation/desktop/desktop-incorporation:library/java/[email protected]
consolidation/desktop/desktop-incorporation:library/java/[email protected]
consolidation/desktop/desktop-incorporation:library/java/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/libproxy/[email protected]
consolidation/desktop/desktop-incorporation:library/libproxy/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/media-player/[email protected]
consolidation/desktop/desktop-incorporation:library/musicbrainz/[email protected]
consolidation/desktop/desktop-incorporation:library/musicbrainz/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/myspell/dictionary/[email protected]
consolidation/desktop/desktop-incorporation:library/python/[email protected],5.11-0.175.3.6.0.4.0
consolidation/desktop/desktop-incorporation:library/python/[email protected],5.11-0.175.3.8.0.2.0
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:library/security/[email protected]
consolidation/desktop/desktop-incorporation:library/security/pam/module/[email protected]
consolidation/desktop/desktop-incorporation:library/speech/[email protected]
consolidation/desktop/desktop-incorporation:library/spell-checking/[email protected]
consolidation/desktop/desktop-incorporation:library/xdg/[email protected]
consolidation/desktop/desktop-incorporation:library/[email protected]
consolidation/desktop/desktop-incorporation:mail/evolution/connector/[email protected]
consolidation/desktop/desktop-incorporation:mail/evolution/connector/[email protected]
consolidation/desktop/desktop-incorporation:mail/[email protected]
consolidation/desktop/desktop-incorporation:media/[email protected]
consolidation/desktop/desktop-incorporation:media/[email protected]
consolidation/desktop/desktop-incorporation:network/chat/[email protected]
consolidation/desktop/desktop-incorporation:package/[email protected]
consolidation/desktop/desktop-incorporation:print/cups/[email protected]
consolidation/desktop/desktop-incorporation:release/[email protected]
consolidation/desktop/desktop-incorporation:runtime/[email protected]
consolidation/desktop/desktop-incorporation:runtime/tcl-8/[email protected],5.11-0.175.3.8.0.2.0
consolidation/desktop/desktop-incorporation:service/gnome/[email protected]
consolidation/desktop/desktop-incorporation:service/[email protected]
consolidation/desktop/desktop-incorporation:storage/[email protected]
consolidation/desktop/desktop-incorporation:system/desktop/[email protected]
consolidation/desktop/desktop-incorporation:system/display-manager/[email protected]
consolidation/desktop/desktop-incorporation:system/display-manager/[email protected]
consolidation/desktop/desktop-incorporation:system/file/[email protected]
consolidation/desktop/desktop-incorporation:system/font/[email protected]
consolidation/desktop/desktop-incorporation:system/library/dbus/[email protected],5.11-0.175.3.6.0.4.0
consolidation/desktop/desktop-incorporation:system/library/[email protected],5.11-0.175.3.6.0.4.0
consolidation/desktop/desktop-incorporation:system/library/[email protected],5.11-0.175.3.6.0.4.0
consolidation/desktop/desktop-incorporation:system/library/[email protected],5.11-0.175.3.6.0.4.0
consolidation/desktop/desktop-incorporation:system/library/security/[email protected]
consolidation/desktop/desktop-incorporation:system/management/cim/[email protected]
consolidation/desktop/desktop-incorporation:system/management/[email protected]
consolidation/desktop/desktop-incorporation:system/management/wbem/[email protected]
consolidation/desktop/desktop-incorporation:system/management/wbem/[email protected]
consolidation/desktop/desktop-incorporation:system/management/web/[email protected]
consolidation/desktop/desktop-incorporation:system/network/[email protected]
consolidation/desktop/desktop-incorporation:terminal/[email protected]
consolidation/desktop/desktop-incorporation:terminal/[email protected]
consolidation/desktop/desktop-incorporation:terminal/[email protected]
consolidation/desktop/desktop-incorporation:terminal/[email protected]
consolidation/desktop/desktop-incorporation:terminal/[email protected]
consolidation/desktop/desktop-incorporation:text/[email protected]
consolidation/desktop/desktop-incorporation:text/[email protected]
consolidation/desktop/desktop-incorporation:web/browser/firefox/[email protected]
consolidation/desktop/desktop-incorporation:web/browser/firefox/plugin/[email protected]
consolidation/desktop/desktop-incorporation:web/editor/[email protected]