22765847 Remove more excess FOSS from Desktop gate [PSARC 2016/088 - minor binding]
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Sun, 30 Oct 2016 19:45:48 -0700
changeset 7221 0e3ebbcfc116
parent 7220 69d9c93534a6
child 7222 37e367b978c0
22765847 Remove more excess FOSS from Desktop gate [PSARC 2016/088 - minor binding] PSARC/2016/088 EOF of more excess FOSS from Desktop consolidation (scrubbing the decks harder)
components/meta-packages/history/SUNWgnome-themes-hires.p5m
components/meta-packages/history/SUNWgnome-themes.p5m
components/meta-packages/history/gnome-base-libs.p5m
components/meta-packages/history/history
components/meta-packages/history/python-gnome-libs-26.p5m
components/meta-packages/incorporation-cache
--- a/components/meta-packages/history/SUNWgnome-themes-hires.p5m	Sun Sep 25 23:15:04 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-#
-# 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) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/[email protected],5.11-0.175.0.0.0.0.0
-set name=pkg.renamed value=true
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-depend type=require [email protected]
-depend type=require [email protected]
--- a/components/meta-packages/history/SUNWgnome-themes.p5m	Sun Sep 25 23:15:04 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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.
-#
-
-set name=pkg.fmri value=pkg:/[email protected],5.11-0.175.0.0.0.0.0
-set name=pkg.renamed value=true
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
-depend type=require [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/gnome-base-libs.p5m	Sun Oct 30 19:45:48 2016 -0700
@@ -0,0 +1,36 @@
+#
+# 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.
+#
+
+# Package split to match upstream components during S11 development
+# Updated to reflect later EOF's of some components
+set name=pkg.fmri value=pkg:/library/gnome/[email protected],5.12-5.12.0.0.0.112.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation \
+    incorporate=consolidation/desktop/gnome-incorporation \
+    value=$(CONSOLIDATION)
+depend type=require fmri=pkg:/library/desktop/atk
+depend type=require fmri=pkg:/library/desktop/cairo
+depend type=require fmri=pkg:/library/desktop/gtk2
+depend type=require fmri=pkg:/library/desktop/libglade
+depend type=require fmri=pkg:/library/desktop/pango
+depend type=require fmri=pkg:/library/glib2
--- a/components/meta-packages/history/history	Sun Sep 25 23:15:04 2016 -0700
+++ b/components/meta-packages/history/history	Sun Oct 30 19:45:48 2016 -0700
@@ -54,7 +54,7 @@
 [email protected],5.11-0.133 developer/[email protected]
 [email protected],5.11-0.133 developer/parser/[email protected]
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0 library/accessibility/[email protected]
 [email protected],5.11-0.133 compress/[email protected]
@@ -92,7 +92,7 @@
 [email protected],5.11-0.175.0.0.0.0.0 system/library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 system/library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0 service/gnome/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0
@@ -121,8 +121,8 @@
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0 text/[email protected]
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/cursor/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/cursor/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.133 developer/documentation-tool/[email protected]
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.12-5.12.0.0.0.90.0
@@ -135,7 +135,7 @@
 [email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.12-5.12.0.0.0.90.0
@@ -214,14 +214,14 @@
 [email protected],5.11-0.175.0.0.0.0.0 gnome/speech/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 gnome/speech/gnome-speech/driver/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/applet/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 desktop/archive-manager/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 image/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 desktop/calculator/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.97.0
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0 desktop/cd-burning/[email protected]
@@ -232,28 +232,28 @@
 [email protected],5.11-0.175.0.0.0.0.0 gnome/config/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 gnome/crash-report/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0 gnome/preferences/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 documentation/gnome/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 developer/gnome/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 gnome/disk-analyzer/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 system/display-manager/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 developer/gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 [email protected]
 [email protected],5.11-0.175.0.0.0.0.0 gnome/file-manager/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/applet/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0 library/gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 gnome/help-viewer/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 communication/im/[email protected]
 [email protected],5.12-5.12.0.0.0.97.0
 [email protected],5.12-5.12.0.0.0.97.0
@@ -270,8 +270,8 @@
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0 image/viewer/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/applet/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/applet/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
@@ -318,7 +318,7 @@
 [email protected],5.11-0.175.0.0.0.0.0 gnome/media/[email protected]
 [email protected],5.12-5.12.0.0.0.94.0
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/applet/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 desktop/pdf-viewer/[email protected]
@@ -330,12 +330,12 @@
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.97.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.97.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/spell-checking/[email protected]
@@ -345,12 +345,14 @@
 [email protected],5.11-0.175.0.0.0.1.0 terminal/[email protected]
 [email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 editor/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected]
 [email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 desktop/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 developer/ui-designer/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 documentation/gnome/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/applet/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 library/gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 gnome/window-manager/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 data/[email protected]
@@ -390,7 +392,7 @@
 [email protected],5.11-0.133 print/filter/ghostscript/fonts/[email protected],5.11-0.133
 [email protected],5.11-0.133 print/filter/ghostscript/fonts/[email protected],5.11-0.133
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.133 archiver/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 developer/documentation-tool/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected]
@@ -442,11 +444,11 @@
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/musicbrainz/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 image/library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 system/library/security/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 library/[email protected] incorporate=consolidation/desktop/gnome-incorporation
@@ -473,7 +475,7 @@
 [email protected],5.11-0.175.0.0.0.0.0 image/library/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 library/samba/[email protected]
 [email protected],5.11-0.133 library/[email protected]
@@ -510,7 +512,7 @@
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0 diagnostic/[email protected]
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 library/musicbrainz/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.133 mail/[email protected]
 [email protected],5.12-5.12.0.0.0.97.0
 [email protected],5.12-5.12.0.0.0.97.0
@@ -535,8 +537,8 @@
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 games/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.1.0 gnome/theme/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 service/network/[email protected]
 [email protected],5.12-5.12.0.0.0.64.0
@@ -616,17 +618,17 @@
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected]
 [email protected]
 [email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0
@@ -635,7 +637,7 @@
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 system/network/routing/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 desktop/remote-desktop/[email protected]
 [email protected],5.11-0.133 backup/[email protected]
 [email protected],5.11-0.133 package/[email protected]
@@ -676,7 +678,7 @@
 [email protected],5.11-0.133 developer/[email protected]
 [email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.82.0
 [email protected],5.12-5.12.0.0.0.82.0
 [email protected],5.12-5.12.0.0.0.70.0
@@ -738,7 +740,7 @@
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 library/graphics/[email protected],5.11-0.133
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/sound/[email protected]
[email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.175.0.0.0.0.0 desktop/xdg/[email protected] incorporate=consolidation/desktop/gnome-incorporation
@@ -790,7 +792,6 @@
 desktop/xdg/[email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
 developer/build/[email protected],5.12-5.12.0.0.0.16.0
 developer/fakero[email protected],5.12-5.12.0.0.0.90.0
-developer/[email protected] 
 developer/gcc-4/[email protected]
 developer/gcc-4/[email protected]
 developer/gcc-4/[email protected]
@@ -801,6 +802,7 @@
 developer/gcc-4/[email protected]
 developer/gcc-4/[email protected]
 developer/gcc-4/[email protected]
+developer/[email protected]
 developer/[email protected]
 developer/[email protected]
 developer/[email protected],5.11-0.174.0.0.0.0.0 group/feature/[email protected]
@@ -820,8 +822,15 @@
 gnome/accessibility/[email protected]
 gnome/accessibility/[email protected],5.11-0.175.0.0.0.0.0
 gnome/applet/[email protected]
+gnome/applet/[email protected],5.12-5.12.0.0.0.112.0
+gnome/applet/[email protected],5.12-5.12.0.0.0.112.0
+gnome/applet/[email protected],5.12-5.12.0.0.0.112.0
+gnome/applet/[email protected],5.12-5.12.0.0.0.112.0
+gnome/applet/[email protected],5.12-5.12.0.0.0.112.0
+gnome/applet/[email protected],5.12-5.12.0.0.0.112.0
 gnome/config/gconf/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 gnome/config/gconf/[email protected],5.12-5.12.0.0.0.96.0
+gnome/crash-report/[email protected],5.12-5.12.0.0.0.112.0
 gnome/desklet/[email protected],5.11-0.175.0.0.0.0.0
 gnome/desklet/[email protected],5.11-0.175.0.0.0.0.0
 gnome/documentation/locale/[email protected],5.11-0.175.0.0.0.0.0
@@ -843,9 +852,13 @@
 gnome/documentation/locale/[email protected],5.11-0.175.0.0.0.0.0
 gnome/documentation/locale/[email protected],5.11-0.175.0.0.0.0.0
 gnome/[email protected],5.12-5.12.0.0.0.90.0
+gnome/[email protected],5.12-5.12.0.0.0.112.0
+gnome/[email protected],5.12-5.12.0.0.0.112.0
+gnome/[email protected],5.12-5.12.0.0.0.112.0
 gnome/[email protected],5.12-5.12.0.0.0.90.0
 gnome/[email protected],5.12-5.12.0.0.0.112.0 gnome/preferences/[email protected]
 gnome/[email protected],5.12-5.12.0.0.0.112.0 desktop/remote-desktop/vino
+gnome/[email protected],5.12-5.12.0.0.0.112.0
 gnome/locale/[email protected],5.11-0.175.0.0.0.0.0
 gnome/locale/[email protected],5.11-0.175.0.0.0.0.0
 gnome/locale/[email protected],5.11-0.175.0.0.0.0.0
@@ -868,10 +881,22 @@
 gnome/media/[email protected],5.12-5.12.0.0.0.112.0 gnome/preferences/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 gnome/media/[email protected],5.12-5.12.0.0.0.112.0 gnome/media/totem
 gnome/media/[email protected]
+gnome/theme/background/[email protected] gnome/theme/background/[email protected]
+gnome/theme/background/[email protected] gnome/theme/background/[email protected]
+gnome/theme/[email protected],5.12-5.12.0.0.0.112.0
+gnome/theme/cursor/[email protected],5.12-5.12.0.0.0.112.0
+gnome/theme/cursor/[email protected],5.12-5.12.0.0.0.112.0
 gnome/theme/cursor/[email protected],5.11-0.175.0.0.0.0.0
+gnome/theme/[email protected],5.12-5.12.0.0.0.112.0
 gnome/theme/[email protected],5.12-5.12.0.0.0.112.0 gnome/theme/gnome-themes-standard
 gnome/theme/[email protected],5.12-5.12.0.0.0.112.0
 gnome/theme/[email protected] gnome/theme/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+gnome/theme/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+gnome/theme/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+gnome/theme/[email protected],5.12-5.12.0.0.0.112.0
+gnome/theme/[email protected],5.12-5.12.0.0.0.112.0
+gnome/theme/sound/[email protected],5.12-5.12.0.0.0.112.0
+gnome/theme/[email protected],5.12-5.12.0.0.0.112.0
 gnome/trusted/[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
 gnome/trusted/[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
 gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
@@ -932,10 +957,14 @@
 library/desktop/gobject/[email protected],5.11-0.175.0.0.0.0.0
 library/desktop/[email protected],5.12-5.12.0.0.0.90.0
 library/desktop/gtk2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
+library/desktop/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/desktop/[email protected],5.12-5.12.0.0.0.112.0
 library/desktop/[email protected],5.11-0.175.0.0.0.0.0
 library/desktop/search/tracker/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/desktop/xdg/[email protected]
+library/[email protected],5.12-5.12.0.0.0.112.0
 library/gnome/[email protected],5.12-5.12.0.0.0.112.0 library/desktop/startup-notification incorporate=consolidation/desktop/gnome-incorporation
+library/gnome/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/gnome/print/[email protected],5.11-0.175.0.0.0.0.0
 library/gnome/print/gnome-print/[email protected],5.11-0.175.0.0.0.0.0
 library/[email protected],5.12-5.12.0.0.0.90.0
@@ -950,6 +979,8 @@
 library/java/[email protected],5.12-5.12.0.0.0.90.0
 library/[email protected],5.12-5.12.0.0.0.90.0
 library/[email protected],5.12-5.12.0.0.0.90.0
+library/musicbrainz/[email protected],5.12-5.12.0.0.0.112.0
+library/musicbrainz/[email protected],5.12-5.12.0.0.0.112.0
 library/myspell/dictionary/[email protected]
 library/myspell/dictionary/[email protected]
 library/myspell/dictionary/[email protected]
@@ -978,7 +1009,7 @@
 library/perl5/[email protected],5.12-5.12.0.0.0.81.0
 library/python-2/[email protected]
 library/python-2/[email protected]
-library/python-2/[email protected],5.12-5.12.0.0.0.80.0 library/python/[email protected]
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected]
@@ -986,38 +1017,39 @@
 library/python-2/[email protected]
 library/python-2/[email protected]
 library/python-2/[email protected],5.12-5.12.0.0.0.109.0 incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.12-5.12.0.0.0.90.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected]
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected]
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.12-5.12.0.0.0.97.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.12-5.12.0.0.0.97.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.12-5.12.0.0.0.97.0
 library/python-2/[email protected],5.12-5.12.0.0.0.97.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
-library/python-2/[email protected],5.12-5.12.0.0.0.85.0 library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+library/python-2/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected],5.11-0.175.0.0.0.0.0
@@ -1027,18 +1059,22 @@
 library/python-2/[email protected]
 library/python/[email protected]
 library/python/[email protected]
+library/python/[email protected],5.12-5.12.0.0.0.112.0
 library/python/[email protected]
 library/python/[email protected]
 library/python/[email protected]
 library/python/[email protected]
 library/python/[email protected] library/python/[email protected] incorporate=consolidation/desktop/gnome-incorporation
+library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python/[email protected],5.12-5.12.0.0.0.90.0
 library/python/[email protected]
+library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python/[email protected]
 library/python/[email protected]
 library/python/[email protected]
 library/python/[email protected]
 library/python/[email protected]
+library/[email protected]
 library/[email protected]
 library/xdg/[email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
 library/[email protected],5.12-5.12.0.0.0.90.0
@@ -1121,7 +1157,6 @@
 system/desktop/[email protected],5.12-5.12.0.0.0.90.0
 system/display-manager/[email protected],5.11-0.175.0.0.0.0.0
 system/file/[email protected],5.12-5.12.0.0.0.90.0
-system/library/security/[email protected]
 system/library/[email protected] 
 system/library/gcc/[email protected]
 system/library/gcc/[email protected]
@@ -1133,6 +1168,7 @@
 system/library/gcc/[email protected]
 system/library/gcc/[email protected]
 system/library/gcc/[email protected]
+system/library/security/[email protected]
 system/management/cim/[email protected],5.12-5.12.0.0.0.90.0
 system/management/[email protected],5.12-5.12.0.0.0.90.0
 system/management/rad/module/[email protected],5.11-0.175.1.0.0.14
--- a/components/meta-packages/history/python-gnome-libs-26.p5m	Sun Sep 25 23:15:04 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#
-# 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) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
-#
-
-set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.0.0.0.0.0
-set name=pkg.renamed value=true
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-depend fmri=library/python-2/[email protected] type=require
-depend fmri=library/python-2/[email protected] type=require
-depend fmri=library/python-2/[email protected] type=require
-depend fmri=library/python-2/[email protected] type=require
-depend fmri=library/python-2/[email protected] type=require
-depend fmri=library/python-2/[email protected] type=require
--- a/components/meta-packages/incorporation-cache	Sun Sep 25 23:15:04 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Sun Oct 30 19:45:48 2016 -0700
@@ -45,19 +45,14 @@
 # to the build or replaced by a package rename/obsolete in the history file.
 #
 consolidation/desktop/gnome-incorporation:gnome/speech/[email protected]
-consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
-consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
 consolidation/desktop/gnome-incorporation:library/audio/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
-consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
-consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
 consolidation/desktop/gnome-incorporation:library/[email protected]
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
 consolidation/desktop/gnome-incorporation:library/python/[email protected]
@@ -67,43 +62,20 @@
 consolidation/userland/userland-incorporation:desktop/remote-desktop/[email protected]
 consolidation/userland/userland-incorporation:developer/ui-designer/[email protected]
 consolidation/userland/userland-incorporation:gnome/accessibility/[email protected]
-consolidation/userland/userland-incorporation:gnome/applet/[email protected]
-consolidation/userland/userland-incorporation:gnome/applet/[email protected]
-consolidation/userland/userland-incorporation:gnome/applet/[email protected]
-consolidation/userland/userland-incorporation:gnome/applet/[email protected]
-consolidation/userland/userland-incorporation:gnome/applet/[email protected]
-consolidation/userland/userland-incorporation:gnome/applet/[email protected]
-consolidation/userland/userland-incorporation:gnome/crash-report/[email protected]
-consolidation/userland/userland-incorporation:gnome/[email protected]
-consolidation/userland/userland-incorporation:gnome/[email protected]
-consolidation/userland/userland-incorporation:gnome/[email protected]
-consolidation/userland/userland-incorporation:gnome/[email protected]
 consolidation/userland/userland-incorporation:gnome/security/seahorse/[email protected]
 consolidation/userland/userland-incorporation:gnome/speech/gnome-speech/driver/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/background/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/background/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/cursor/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/cursor/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/sound/[email protected]
-consolidation/userland/userland-incorporation:gnome/theme/[email protected]
 consolidation/userland/userland-incorporation:gnome/window-manager/[email protected]
 consolidation/userland/userland-incorporation:image/library/[email protected]
 consolidation/userland/userland-incorporation:library/accessibility/[email protected]
-consolidation/userland/userland-incorporation:library/desktop/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
-consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/libproxy/[email protected]
 consolidation/userland/userland-incorporation:library/libproxy/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
 consolidation/userland/userland-incorporation:library/[email protected]
-consolidation/userland/userland-incorporation:library/musicbrainz/[email protected]
-consolidation/userland/userland-incorporation:library/musicbrainz/[email protected]
-consolidation/userland/userland-incorporation:library/[email protected]
+consolidation/userland/userland-incorporation:library/python/[email protected]
+consolidation/userland/userland-incorporation:library/python/[email protected]
+consolidation/userland/userland-incorporation:library/python/[email protected]
 consolidation/userland/userland-incorporation:library/security/pam/module/[email protected]
 consolidation/userland/userland-incorporation:library/speech/[email protected]
 consolidation/userland/userland-incorporation:library/xdg/[email protected]