Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
22839226 Migrate Desktop meta-packages to Userland gate
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 09 Mar 2016 16:26:11 -0800
changeset 5571 bd6c9b9b753f
parent 5570 0b0946d94dd3
child 5574 9bd61b09c3ce
22839226 Migrate Desktop meta-packages to Userland gate 22862674 Drop leading 0. from userland-incorporation version
components/Makefile file | annotate | diff | comparison | revisions
components/desktop/xscreensaver/history file | annotate | diff | comparison | revisions
components/meta-packages/history/README file | annotate | diff | comparison | revisions
components/meta-packages/history/SUNWgnome-themes-hires.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/SUNWgnome-themes.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/docbook.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/history file | annotate | diff | comparison | revisions
components/meta-packages/history/old-gnome-incorporation.p5m file | annotate | diff | comparison | revisions
components/meta-packages/history/python-gnome-libs-26.p5m file | annotate | diff | comparison | revisions
components/meta-packages/incorporation-cache file | annotate | diff | comparison | revisions
doc/packaging.txt file | annotate | diff | comparison | revisions
tools/generate-history file | annotate | diff | comparison | revisions
tools/userland-incorporator file | annotate | diff | comparison | revisions 
--- a/components/Makefile	Wed Mar 09 15:02:59 2016 -0800
+++ b/components/Makefile	Wed Mar 09 16:26:11 2016 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../make-rules/shared-macros.mk
@@ -159,9 +159,14 @@
 INCORPORATE_WERROR ?= --Werror
 
 incorporation:
-	$(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \
-          --version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \
-	  -c $(CONSOLIDATION) --destdir=$(WS_MACH) $(INCORPORATE_WERROR)
+	$(WS_TOOLS)/userland-incorporator \
+		--repository $(PKG_REPO) \
+		--version $(OS_VERSION),$(BUILD_VERSION) \
+		--publisher $(PUBLISHER) \
+		--consolidation $(CONSOLIDATION) \
+		--destdir $(WS_MACH) \
+		--static-content-file $(WS_COMPONENTS)/meta-packages/incorporation-cache \
+		$(INCORPORATE_WERROR)
 	for incorporation in $(WS_MACH)/*.p5m ; do \
 	    $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \
 	               $${incorporation} ; \
--- a/components/desktop/xscreensaver/history	Wed Mar 09 15:02:59 2016 -0800
+++ b/components/desktop/xscreensaver/history	Wed Mar 09 16:26:11 2016 -0800
@@ -1,3 +1,4 @@
[email protected],5.11-0.175.0.0.0.0.0 [email protected]
 [email protected] desktop/[email protected]
 [email protected] desktop/xscreensaver/[email protected]
 [email protected] desktop/xscreensaver/hacks/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/README	Wed Mar 09 16:26:11 2016 -0800
@@ -0,0 +1,7 @@
+See $(WS)/doc/packaging.txt for information about the history file.
+
+To sort the history file into the canonical ordering, use:
+env LC_COLLATE=C sort -t @ -k 1,1 history
+
+The other *.p5m here are history entries more complex than the simple
+one-to-one mapping of the history file allows for.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWgnome-themes-hires.p5m	Wed Mar 09 16:26:11 2016 -0800
@@ -0,0 +1,30 @@
+#
+# 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]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWgnome-themes.p5m	Wed Mar 09 16:26:11 2016 -0800
@@ -0,0 +1,43 @@
+#
+# 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/docbook.p5m	Wed Mar 09 16:26:11 2016 -0800
@@ -0,0 +1,33 @@
+#
+# 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:/data/[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 fmri=data/docbook/[email protected]
+depend type=require fmri=data/docbook/[email protected]
+depend type=require fmri=data/docbook/[email protected]
+depend type=require fmri=data/[email protected]
+depend type=require fmri=data/[email protected]
--- a/components/meta-packages/history/history	Wed Mar 09 15:02:59 2016 -0800
+++ b/components/meta-packages/history/history	Wed Mar 09 16:26:11 2016 -0800
@@ -1,14 +1,20 @@
[email protected]
 [email protected]
 [email protected]
 [email protected],5.11-0.151
 [email protected],5.11-0.130
 [email protected],5.11-0.171
 [email protected],5.11-0.171
[email protected]
[email protected],5.11-0.175.0.0.0.0.0 desktop/administration/[email protected]
 [email protected]
[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]
[email protected],5.11-0.175.0.0.0.0.0 library/python-2/[email protected]
 [email protected]
 [email protected],5.11-0.133 runtime/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 image/library/[email protected]
 [email protected],5.11-0.133 runtime/[email protected]
 [email protected],5.11-0.133 print/lp/filter/[email protected]
 [email protected],5.11-0.133 library/[email protected]
@@ -16,27 +22,30 @@
 [email protected],5.11-0.133 developer/build/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 developer/parser/[email protected]
 [email protected]
[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
[email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
[email protected],5.12-5.12.0.0.0.73.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
[email protected]
 [email protected],5.12-5.12.0.0.0.56.0
 [email protected],5.12-5.12.0.0.0.56.0
[email protected],5.12-5.12.0.0.0.56.0
 [email protected],5.12-5.12.0.0.0.56.0
[email protected],5.12-5.12.0.0.0.56.0
 [email protected],5.12-5.12.0.0.0.56.0
 [email protected],5.12-5.12.0.0.0.56.0
 [email protected],5.12-5.12.0.0.0.56.0
 [email protected],5.12-5.12.0.0.0.85.0
 [email protected],5.11-0.133 developer/build/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 system/network/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 image/library/[email protected]
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
 [email protected],5.11-0.133 runtime/java/[email protected]
@@ -44,53 +53,320 @@
 [email protected],5.11-0.133 network/dns/[email protected]
 [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.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]
[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/desktop/c++/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[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.12-5.12.0.0.0.90.0
 [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
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/clutter/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/clutter/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.133 developer/build/[email protected]
[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.12-5.12.0.0.0.90.0
[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.12-5.12.0.0.0.90.0
[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
[email protected],5.11-0.175.0.0.0.0.0 library/xdg/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/security/pam/module/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/applet/[email protected]
 [email protected],5.11-0.133 text/[email protected]
[email protected],5.11-0.133 print/[email protected]
 [email protected],5.11-0.133 library/print/[email protected]
[email protected],5.11-0.133 print/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 print/cups/[email protected]
 [email protected],5.11-0.133 web/[email protected]
 [email protected],5.11-0.133 developer/versioning/[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]
[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.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
[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
[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
[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
[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
[email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/search/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/search/tracker/[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 system/display-manager/[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 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.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
 [email protected],5.11-0.133 web/server/[email protected]
 [email protected],5.11-0.133 web/browser/[email protected]
[email protected],5.11-0.133 runtime/[email protected]
 [email protected],5.11-0.133 runtime/erlang/[email protected]
[email protected],5.11-0.133 runtime/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/speech/[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/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.90.0
 [email protected],5.11-0.133 shell/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 library/fastcgi/[email protected]
[email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 mail/[email protected]
 [email protected],5.11-0.133 print/lp/filter/[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 web/browser/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 web/data/[email protected]
[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
[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
[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
[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 codec/[email protected]
 [email protected],5.11-0.133 developer/lexer/[email protected]
 [email protected],5.11-0.133 system/library/[email protected]
[email protected],5.11-0.133 print/cups/filter/[email protected]
 [email protected],5.11-0.133 print/cups/filter/[email protected]
[email protected],5.11-0.133 print/cups/filter/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 print/lp/filter/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 storage/[email protected]
 [email protected],5.11-0.133 service/network/[email protected],5.11-0.133
[email protected],5.11-0.175.0.0.0.0.0 library/file-monitor/[email protected]
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
 [email protected],5.11-0.133 system/library/[email protected]
 [email protected],5.11-0.133 system/prerequisite/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 developer/debug/[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
[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
[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
[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
[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.133 text/[email protected]
 [email protected],5.11-0.133 print/filter/[email protected],5.11-0.133
[email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.133 developer/versioning/[email protected]
[email protected],5.12-5.12.0.0.0.90.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 library/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/c++/[email protected]
 [email protected],5.11-0.133 developer/macro/[email protected]
 [email protected],5.11-0.133 developer/build/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/accessibility/[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/accessibility/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.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.11-0.175.0.0.0.0.0 gnome/accessibility/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/accessibility/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/accessibility/[email protected]
[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.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.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.11-0.175.0.0.0.0.0 image/editor/gimp/plugin/[email protected]
[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]
[email protected],5.11-0.175.0.0.0.0.0 desktop/character-map/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
[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 library/gnome/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 gnome/config/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 gnome/config/gconf/[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 gnome/crash-report/[email protected]
[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.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 system/font/[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.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.11-0.175.0.0.0.0.0 communication/im/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 image/editor/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 image/editor/gimp/[email protected]
[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
[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
[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.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.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
[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
[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
[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
[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
[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
[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
[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
[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
[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/gnome/[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 library/audio/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 gnome/media/[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/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.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]
[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]
[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.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
[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.11-0.175.0.0.0.0.0 library/python-2/[email protected] 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.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.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 gnome/media/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/spell-checking/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 desktop/system-monitor/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
[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.11-0.175.0.0.0.0.0 gnome/theme/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected]
[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.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]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 developer/build/[email protected]
 [email protected],5.12-5.12.0.0.0.16.0
 [email protected],5.11-0.133 file/[email protected]
 [email protected],5.11-0.133 library/database/[email protected]
 [email protected],5.11-0.133 text/[email protected]
[email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
 [email protected],5.11-0.133 editor/gnu-emacs/[email protected]
[email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 file/[email protected]
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
@@ -98,33 +374,62 @@
 [email protected],5.11-0.133 file/[email protected]
 [email protected],5.11-0.133 library/[email protected],5.11-0.133
 [email protected],5.11-0.133 library/[email protected],5.11-0.133
[email protected],5.11-0.175.0.0.0.0.0 editor/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 crypto/[email protected]
 [email protected],5.11-0.133 image/[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.90.0
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/gobject/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.133 image/[email protected]
 [email protected],5.11-0.133 text/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.12-5.12.0.0.0.85.0
 [email protected],5.11-0.175.0.0.0.0.0 text/[email protected]
 [email protected],5.11-0.130 [email protected]
 [email protected],5.11-0.133 text/[email protected]
 [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.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]
[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.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 gnome/theme/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/gtk2/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/c++/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 benchmark/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[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.133 library/[email protected]
 [email protected],5.11-0.133 print/filter/[email protected],5.11-0.133
 [email protected],5.11-0.133 editor/[email protected]
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 print/cups/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.133 editor/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 [email protected],5.11-0.133 print/filter/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 system/data/[email protected],5.11-0.133
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/xdg/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 image/[email protected]
 [email protected],5.11-0.133 benchmark/[email protected]
 [email protected]
[email protected],5.11-0.175.0.0.0.0.0 network/chat/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 data/[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 image/library/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 developer/java/[email protected]
 [email protected],5.11-0.170
 [email protected],5.11-0.133 library/[email protected]
@@ -132,41 +437,92 @@
 SUNWless@436,5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 network/ftp/[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/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/xdg/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.90.0
 [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.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.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
[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 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]
[email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
 [email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 library/graphics/[email protected]
 [email protected],5.11-0.133 system/library/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 system/library/usb/[email protected]
 [email protected],5.11-0.133 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
[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/[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 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.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]
[email protected],5.11-0.175.0.0.0.0.0 library/[email protected]
 [email protected],5.11-0.133 library/c++/[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 codec/[email protected]
 [email protected],5.11-0.133 developer/build/[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.133 system/library/usb/[email protected]
 [email protected],5.11-0.133 system/library/usb/[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.12-5.12.0.0.0.90.0
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 web/server/[email protected]
 [email protected],5.11-0.133 web/browser/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected],5.11-0.133
 [email protected],5.11-0.133 library/python-2/[email protected],5.11-0.133
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 library/libtool/[email protected]
 [email protected],5.11-0.133 runtime/[email protected]
[email protected],5.11-0.133 library/[email protected]
 [email protected]
[email protected],5.11-0.133 library/[email protected]
[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected]
[email protected],5.11-0.175.0.0.0.0.0 web/browser/[email protected]
 [email protected],5.11-0.133 developer/[email protected]
[email protected],5.11-0.133 service/[email protected]
 [email protected],5.11-0.133 library/java/[email protected]
[email protected],5.11-0.133 service/[email protected]
 [email protected],5.11-0.133 developer/versioning/[email protected]
 [email protected],5.11-0.133 media/[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
[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.11-0.133 mail/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/myspell/dictionary/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/myspell/dictionary/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/myspell/dictionary/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/myspell/dictionary/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/myspell/dictionary/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/myspell/dictionary/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/myspell/dictionary/[email protected]
 [email protected],5.11-0.133 database/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
 [email protected]
 [email protected],5.12-5.12.0.0.0.45.0
 [email protected],5.12-5.12.0.0.0.45.0
@@ -178,22 +534,42 @@
 [email protected],5.11-0.133 system/management/snmp/[email protected]
 [email protected],5.11-0.133 system/management/snmp/net-snmp/[email protected]
 [email protected],5.11-0.132 [email protected]
[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.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
[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 runtime/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 codec/[email protected]
 [email protected],5.11-0.133 library/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 developer/documentation-tool/[email protected]
 [email protected],5.11-0.133 library/[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/background/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/theme/background/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 release/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 developer/documentation-tool/[email protected]
[email protected],5.11-0.133 library/security/[email protected]
 [email protected],5.11-0.133 library/security/openssl/[email protected]
[email protected],5.11-0.133 library/security/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 library/security/pam/module/[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/desktop/c++/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 text/[email protected]
 [email protected],5.11-0.133 terminal/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 library/perl-5/[email protected]
 [email protected],5.11-0.133 library/perl-5/[email protected]
 [email protected],5.11-0.133 library/perl-5/[email protected]
 [email protected],5.11-0.133 library/perl-5/[email protected]
[email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
@@ -202,16 +578,20 @@
 [email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
[email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
[email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
[email protected],5.12-5.12.0.0.0.73.0
 [email protected],5.12-5.12.0.0.0.73.0
[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
 [email protected],5.11-0.133 library/perl-5/[email protected],5.11-0.133
[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 service/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.133 web/proxy/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 mail/[email protected]
 [email protected],5.11-0.133 print/[email protected]
@@ -219,92 +599,322 @@
 [email protected],5.11-0.133 crypto/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected],5.11-0.133
 [email protected],5.11-0.133 developer/python/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.133 library/python-2/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.133 library/python-2/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.133 library/python-2/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected]
 [email protected]
[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
[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
[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]
 [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]
 [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]
[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
[email protected],5.11-0.175.0.0.0.0.0
 [email protected]
[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.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]
[email protected],5.11-0.175.0.0.0.0.0 image/[email protected]
 [email protected],5.11-0.133 network/[email protected]
 [email protected],5.11-0.133 network/[email protected]
 [email protected],5.12-5.12.0.0.0.55.0
 [email protected],5.11-0.133 image/scanner/xsane/[email protected]
 [email protected],5.11-0.133 image/scanner/xsane/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 terminal/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/security/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 gnome/security/seahorse/[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 system/storage/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/c++/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected]
[email protected],5.12-5.12.0.0.0.19.0
 [email protected]
 [email protected],5.11-0.133 service/network/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
[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.133 audio/[email protected]
 [email protected],5.11-0.133 web/fastcgi/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 codec/[email protected]
 [email protected],5.11-0.133 web/proxy/[email protected]
 [email protected],5.11-0.133 network/[email protected],5.11-0.133
 [email protected],5.11-0.133 network/ssh/[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 service/security/[email protected]
 [email protected],5.11-0.133 security/[email protected]
[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.133 developer/versioning/[email protected]
 [email protected],5.11-0.133 library/java/[email protected]
 [email protected],5.11-0.133 library/perl-5/[email protected]
 [email protected],5.11-0.133 library/python-2/[email protected]
[email protected],5.11-0.133 developer/versioning/[email protected]
 [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.82.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
 [email protected],5.11-0.133 diagnostic/[email protected]
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 library/[email protected],5.11-0.133
[email protected],5.11-0.175.0.0.0.0.0 terminal/[email protected]
 [email protected],5.11-0.133 text/[email protected]
[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
[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
[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
[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.11-0.175.0.0.0.0.0 mail/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 mail/thunderbird/plugin/[email protected]
[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
[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
[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
[email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.11-0.133 text/[email protected]
 [email protected],5.11-0.133 diagnostic/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 library/media-player/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 file/[email protected]
[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 library/security/[email protected]
 [email protected],5.11-0.170
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 archiver/[email protected]
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 editor/[email protected]
[email protected],5.11-0.175.0.0.0.0.0 desktop/remote-desktop/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
[email protected],5.11-0.175.0.0.0.0.0 web/browser/[email protected]
 [email protected],5.11-0.175.0.0.0.0.0 web/analytics/[email protected]
 [email protected],5.11-0.133 web/[email protected]
 [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.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
[email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 service/storage/[email protected]
 [email protected],5.11-0.133 compress/[email protected]
 [email protected],5.11-0.133 library/[email protected]
 [email protected],5.11-0.133 shell/[email protected]
 [email protected],5.11-0.133 web/[email protected]
 backup/[email protected],5.12-5.12.0.0.0.85.0
-runtime/[email protected]
+codec/install/[email protected],5.11-0.175.0.0.0.0.0
+communication/conferencing/[email protected],5.12-5.12.0.0.0.94.0
+communication/pda/[email protected],5.12-5.12.0.0.0.90.0
+communication/pda/[email protected],5.12-5.12.0.0.0.90.0
+consolidation/desktop/[email protected] consolidation/userland/userland-incorporation
+consolidation/gnome_l10n/[email protected],5.11-0.175.0.0.0.0.0
+database/[email protected],5.12-5.12.0.0.0.45.0
 database/mysql-51/[email protected],5.12-5.12.0.0.0.45.0
 database/mysql-51/[email protected],5.12-5.12.0.0.0.45.0
-database/[email protected],5.12-5.12.0.0.0.45.0
+desktop/administration/[email protected],5.11-0.175.0.0.0.0.0
+desktop/administration/[email protected],5.12-5.12.0.0.0.64.0
+desktop/[email protected],5.12-5.12.0.0.0.90.0
+desktop/cd-ripping/[email protected],5.12-5.12.0.0.0.90.0
+desktop/[email protected],5.12-5.12.0.0.0.90.0
+desktop/compiz/[email protected],5.12-5.12.0.0.0.90.0
+desktop/compiz/library/[email protected],5.12-5.12.0.0.0.90.0
+desktop/compiz/library/[email protected],5.12-5.12.0.0.0.90.0
+desktop/compiz/plugin/[email protected],5.12-5.12.0.0.0.90.0
+desktop/compiz/plugin/[email protected],5.12-5.12.0.0.0.90.0
+desktop/file-manager/[email protected],5.12-5.12.0.0.0.90.0
+desktop/[email protected],5.12-5.12.0.0.0.90.0
+desktop/irc/[email protected],5.12-5.12.0.0.0.90.0
+desktop/media-player/[email protected],5.11-0.175.0.0.0.0.0
+desktop/media-player/moovida/[email protected],5.11-0.175.0.0.0.0.0
+desktop/media-player/[email protected],5.11-0.175.0.0.0.0.0
+desktop/network/[email protected],5.12-5.12.0.0.0.90.0
+desktop/project-management/[email protected],5.12-5.12.0.0.0.90.0
+desktop/project-management/[email protected],5.12-5.12.0.0.0.90.0
+desktop/remote-desktop/[email protected],5.12-5.12.0.0.0.90.0
+desktop/studio/[email protected],5.12-5.12.0.0.0.90.0
+desktop/system-monitor/[email protected],5.12-5.12.0.0.0.90.0
+desktop/time-tracking/[email protected],5.11-0.175.0.0.0.0.0
+desktop/torrent/[email protected],5.12-5.12.0.0.0.90.0
+desktop/[email protected],5.11-0.175.0.0.0.0.0
+desktop/xdg/menu-editor/[email protected],5.12-5.12.0.0.0.90.0
+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/[email protected],5.12-5.12.0.0.0.90.0
 developer/[email protected],5.11-0.174.0.0.0.0.0 group/feature/[email protected]
+developer/java/[email protected],5.12-5.12.0.0.0.90.0
+developer/java/[email protected],5.12-5.12.0.0.0.90.0
+developer/lexer/[email protected],5.12-5.12.0.0.0.90.0
+developer/parser/[email protected],5.12-5.12.0.0.0.90.0
+developer/parser/[email protected],5.12-5.12.0.0.0.90.0
+documentation/[email protected],5.12-5.12.0.0.0.90.0
+editor/blog/[email protected],5.12-5.12.0.0.0.90.0
+editor/diagram/[email protected],5.12-5.12.0.0.0.90.0
+editor/[email protected],5.11-0.175.0.0.0.0.0
+editor/[email protected],5.12-5.12.0.0.0.90.0
+file/[email protected],5.12-5.12.0.0.0.19.0
+games/[email protected],5.12-5.12.0.0.0.90.0
 [email protected],5.11-0.133 developer/[email protected]
+gnome/accessibility/[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/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
+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/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/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/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/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/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/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/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/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.90.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
+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
+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
+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
+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
+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
+gnome/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/theme/cursor/[email protected],5.11-0.175.0.0.0.0.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
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.0
+gnome/trusted/locale/[email protected],5.11-0.175.0.0.0.0.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/[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
 group/feature/[email protected]
+image/[email protected],5.12-5.12.0.0.0.90.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
+image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
 image/graphviz/[email protected],5.12-5.12.0.0.0.87.0 image/graphviz/[email protected],5.12-5.12.0.0.0.87.0
 image/graphviz/[email protected],5.12-5.12.0.0.0.81.0
+image/scanner/[email protected],5.12-5.12.0.0.0.90.0
+image/viewer/[email protected],5.12-5.12.0.0.0.90.0
+image/viewer/[email protected],5.12-5.12.0.0.0.90.0
+image/webcam/[email protected],5.12-5.12.0.0.0.90.0
+library/[email protected],5.12-5.12.0.0.0.56.0
 library/apr-13/[email protected],5.12-5.12.0.0.0.56.0
-library/[email protected],5.12-5.12.0.0.0.56.0
+library/[email protected],5.12-5.12.0.0.0.56.0
 library/apr-util-13/[email protected],5.12-5.12.0.0.0.56.0
 library/apr-util-13/[email protected],5.12-5.12.0.0.0.56.0
 library/apr-util-13/[email protected],5.12-5.12.0.0.0.56.0
 library/apr-util-13/[email protected],5.12-5.12.0.0.0.56.0
-library/[email protected],5.12-5.12.0.0.0.56.0
+library/audio/gstreamer/plugin/[email protected],5.12-5.12.0.0.0.90.0
+library/audio/[email protected],5.12-5.12.0.0.0.90.0
+library/c++/[email protected],5.12-5.12.0.0.0.90.0
+library/c++/[email protected],5.12-5.12.0.0.0.90.0
+library/c++/[email protected],5.12-5.12.0.0.0.90.0
+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.11-0.175.0.0.0.0.0
+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
 library/[email protected]
+library/java/[email protected],5.12-5.12.0.0.0.90.0
 library/java/[email protected],5.12-5.12.0.0.0.85.0
+library/java/[email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
+library/java/java-gnome/[email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
+library/java/java-gnome/[email protected],5.12-5.12.0.0.0.90.0 incorporate=consolidation/desktop/gnome-incorporation
+library/java/[email protected],5.12-5.12.0.0.0.90.0
+library/java/[email protected],5.12-5.12.0.0.0.90.0
+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/perl-5/[email protected],5.12-5.12.0.0.0.81.0
 library/perl-5/[email protected],5.12-5.12.0.0.0.42.0
 library/perl-5/[email protected],5.12-5.12.0.0.0.81.0
@@ -324,44 +934,150 @@
 library/perl-5/[email protected],5.12-5.12.0.0.0.81.0
 library/perl-5/[email protected],5.12-5.12.0.0.0.14.0
 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]
+library/python-2/[email protected],5.12-5.12.0.0.0.80.0 library/python/[email protected]
+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]
 library/python-2/[email protected]
-library/python-2/[email protected]
+library/python-2/[email protected]
 library/python-2/[email protected]
-library/python-2/[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.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.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.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.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.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.11-0.175.0.0.0.0.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.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.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.11-0.175.0.0.0.0.0
+library/python-2/[email protected],5.11-0.175.0.0.0.1.0 library/python-2/[email protected]
+library/python-2/[email protected],5.12-5.12.0.0.0.87.0 library/python/[email protected]
+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.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
+library/python-2/[email protected],5.11-0.175.0.0.0.0.0
 library/python-2/[email protected]
-library/python-2/[email protected]
 library/python-2/[email protected]
-library/python/[email protected]
+library/python-2/[email protected]
 library/python/[email protected]
+library/python/[email protected]
+library/python/[email protected]
 library/python/[email protected]
-library/python/[email protected]
+library/python/[email protected]
 library/python/[email protected]
-library/python/[email protected]
+library/python/[email protected],5.12-5.12.0.0.0.90.0
 library/python/[email protected]
+library/python/[email protected]
 library/python/[email protected]
-library/python/[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
+mail/[email protected],5.12-5.12.0.0.0.90.0
+mail/evolution/connector/[email protected],5.12-5.12.0.0.0.90.0
+mail/evolution/connector/[email protected],5.11-0.175.0.0.0.0.0
+mail/evolution/connector/[email protected],5.12-5.12.0.0.0.90.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/locale/[email protected],5.11-0.175.0.0.0.0.0
+mail/thunderbird/plugin/[email protected],5.11-0.175.0.0.0.0.0 mail/thunderbird/plugin/[email protected]
+media/[email protected],5.12-5.12.0.0.0.90.0
+media/[email protected],5.12-5.12.0.0.0.90.0
 network/chat/[email protected]
 network/nntp/[email protected]
 network/[email protected],5.11-0.170
 network/ssh/[email protected] network/[email protected]
 print/lp/filter/[email protected],5.11-0.173.0.0.0.0.0 print/filter/[email protected],5.11-0.173.0.0.0.0.0
+print/lp/[email protected],5.11-0.175.0.0.0.0.0
+release/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/getting-started/locale/[email protected],5.11-0.175.0.0.0.0.0
+release/[email protected],5.11-0.175.0.0.0.0.0 release/[email protected]
+runtime/[email protected]
 runtime/ocaml/[email protected],5.11-0.170
+runtime/[email protected],5.11-0.175.0.0.0.0.0
+runtime/[email protected],5.11-0.175.0.0.0.0.0
+runtime/[email protected]
 runtime/python-26/[email protected]
-runtime/[email protected]
 runtime/[email protected],5.12-5.12.0.0.0.55.0
 runtime/[email protected]
 runtime/ruby-19/[email protected]
 runtime/tcl-8/[email protected],5.12-5.12.0.0.0.70.0
+security/[email protected],5.11-0.175.1.0.0.21.0 security/compliance/[email protected],5.11-0.175.1.0.0.21.0
 security/[email protected]
 security/[email protected]
-security/[email protected],5.11-0.175.1.0.0.21.0 security/compliance/[email protected],5.11-0.175.1.0.0.21.0
 service/network/samba/[email protected]
+service/storage/[email protected],5.11-0.175.0.0.0.0.0 desktop/[email protected]
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+system/desktop/locale/[email protected],5.11-0.175.0.0.0.0.0
+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/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
+system/management/[email protected]
 system/management/[email protected]
 system/management/visual-panels/[email protected]
 system/management/visual-panels/[email protected]
@@ -376,19 +1092,48 @@
 system/management/visual-panels/[email protected]
 system/management/visual-panels/[email protected]
 system/management/visual-panels/[email protected]
-system/management/[email protected]
+system/management/wbem/[email protected],5.12-5.12.0.0.0.90.0
+system/management/wbem/[email protected],5.12-5.12.0.0.0.90.0
+system/management/web/[email protected],5.12-5.12.0.0.0.90.0
+system/trusted/[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
 system/trusted/[email protected]
+system/xvm/[email protected],5.11-0.175.0.0.0.0.0
+terminal/[email protected],5.12-5.12.0.0.0.90.0
 terminal/[email protected],5.12-5.12.0.0.0.81.0
+terminal/[email protected],5.12-5.12.0.0.0.90.0
+terminal/[email protected],5.12-5.12.0.0.0.90.0
+text/[email protected],5.12-5.12.0.0.0.90.0
[email protected],5.12-5.12.0.0.0.87.0 incorporate=consolidation/desktop/gnome-incorporation
 web/[email protected],5.11-0.174.0.0.0.0.0 group/feature/[email protected]
-web/java-servlet/tomcat/[email protected],5.12-5.12.0.0.0.82.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/locale/[email protected],5.11-0.175.0.0.0.0.0
+web/browser/firefox/plugin/[email protected],5.11-0.175.1.0.0.20.0
+web/browser/firefox/plugin/[email protected],5.12-5.12.0.0.0.90.0
+web/browser/firefox/plugin/[email protected],5.12-5.12.0.0.0.90.0
+web/editor/[email protected],5.12-5.12.0.0.0.90.0
+web/firefox/plugin/[email protected],5.11-2
 web/java-servlet/[email protected],5.12-5.12.0.0.0.82.0
+web/java-servlet/tomcat/[email protected],5.12-5.12.0.0.0.82.0
+web/library/apache/[email protected],5.12-5.12.0.0.0.57.0
 web/library/apache/apr-13/[email protected],5.12-5.12.0.0.0.57.0
-web/library/apache/[email protected],5.12-5.12.0.0.0.57.0
+web/library/apache/[email protected],5.12-5.12.0.0.0.57.0
 web/library/apache/apr-util-13/[email protected],5.12-5.12.0.0.0.57.0
 web/library/apache/apr-util-13/[email protected],5.12-5.12.0.0.0.57.0
 web/library/apache/apr-util-13/[email protected],5.12-5.12.0.0.0.57.0
 web/library/apache/apr-util-13/[email protected],5.12-5.12.0.0.0.57.0
-web/library/apache/[email protected],5.12-5.12.0.0.0.57.0
+web/[email protected],5.12-5.12.0.0.0.73.0
 web/php-52/[email protected],5.12-5.12.0.0.0.73.0
 web/php-52/extension/[email protected],5.12-5.12.0.0.0.73.0
 web/php-52/extension/[email protected],5.12-5.12.0.0.0.73.0
@@ -398,7 +1143,7 @@
 web/php-52/extension/[email protected],5.12-5.12.0.0.0.73.0
 web/php-52/extension/[email protected],5.12-5.12.0.0.0.73.0
 web/php-52/extension/[email protected],5.12-5.12.0.0.0.73.0
-web/[email protected],5.12-5.12.0.0.0.73.0
+web/[email protected]
 web/php-53/[email protected]
 web/php-53/extension/[email protected]
 web/php-53/extension/[email protected]
@@ -409,12 +1154,11 @@
 web/php-53/extension/[email protected]
 web/php-53/extension/[email protected]
 web/php-53/extension/[email protected]
-web/[email protected]
 web/server/[email protected]
 web/server/apache-22/[email protected]
+web/server/apache-22/module/[email protected],5.12-5.12.0.0.0.73.0
 web/server/apache-22/module/[email protected],5.12-5.12.0.0.0.73.0
 web/server/apache-22/module/[email protected]
-web/server/apache-22/module/[email protected],5.12-5.12.0.0.0.73.0
 web/server/apache-22/module/[email protected]
 web/server/apache-22/module/[email protected]
 web/server/apache-22/module/[email protected]
@@ -424,5 +1168,6 @@
 web/server/apache-22/plugin/[email protected],5.12-5.12.0.0.0.76.0
 web/server/apache-22/plugin/[email protected]
 web/server/apache-22/plugin/[email protected]
+web/server/apache-22/plugin/[email protected]
 web/server/apache-22/plugin/[email protected]
-web/server/apache-22/plugin/[email protected]
[email protected],5.11-0.175.0.0.0.0.0
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/old-gnome-incorporation.p5m	Wed Mar 09 16:26:11 2016 -0800
@@ -0,0 +1,35 @@
+#
+# 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:/consolidation/gnome/[email protected],5.11-0.175.0.0.0.0.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation \
+    incorporate=consolidation/desktop/gnome-incorporation \
+    value=$(CONSOLIDATION)
+depend type=require \
+    fmri=consolidation/desktop/[email protected]
+depend type=require \
+    fmri=consolidation/desktop/[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/python-gnome-libs-26.p5m	Wed Mar 09 16:26:11 2016 -0800
@@ -0,0 +1,34 @@
+#
+# 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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/incorporation-cache	Wed Mar 09 16:26:11 2016 -0800
@@ -0,0 +1,244 @@
+#
+# 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
+# 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/gnome-incorporation:benchmark/[email protected]
+consolidation/desktop/gnome-incorporation:desktop/xdg/[email protected]
+consolidation/desktop/gnome-incorporation:developer/documentation-tool/[email protected]
+consolidation/desktop/gnome-incorporation:developer/gnome/[email protected]
+consolidation/desktop/gnome-incorporation:developer/gnome/[email protected]
+consolidation/desktop/gnome-incorporation:developer/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/accessibility/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/config/gconf/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/config/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/file-manager/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/help-viewer/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/media/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/media/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/preferences/[email protected]
+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:gnome/theme/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
+consolidation/desktop/gnome-incorporation:gnome/theme/[email protected]
+consolidation/desktop/gnome-incorporation:image/[email protected]
+consolidation/desktop/gnome-incorporation:library/audio/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/c++/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/clutter/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/clutter/[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/gobject/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/gtk2/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/gtk3/[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/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/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/search/tracker/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/search/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/xdg/[email protected]
+consolidation/desktop/gnome-incorporation:library/desktop/xdg/[email protected]
+consolidation/desktop/gnome-incorporation:library/[email protected]
+consolidation/desktop/gnome-incorporation:library/[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/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]
+consolidation/desktop/gnome-incorporation:library/python/[email protected]
+consolidation/desktop/gnome-incorporation:library/python/[email protected]
+consolidation/desktop/gnome-incorporation:library/python/[email protected]
+consolidation/desktop/gnome-incorporation:library/python/[email protected]
+consolidation/userland/userland-incorporation:codec/[email protected]
+consolidation/userland/userland-incorporation:codec/[email protected]
+consolidation/userland/userland-incorporation:codec/[email protected]
+consolidation/userland/userland-incorporation:codec/[email protected]
+consolidation/userland/userland-incorporation:data/docbook/[email protected]
+consolidation/userland/userland-incorporation:data/docbook/[email protected]
+consolidation/userland/userland-incorporation:data/docbook/[email protected]
+consolidation/userland/userland-incorporation:data/[email protected]
+consolidation/userland/userland-incorporation:data/[email protected]
+consolidation/userland/userland-incorporation:data/[email protected]
+consolidation/userland/userland-incorporation:desktop/archive-manager/[email protected]
+consolidation/userland/userland-incorporation:desktop/calculator/[email protected]
+consolidation/userland/userland-incorporation:desktop/cd-burning/[email protected]
+consolidation/userland/userland-incorporation:desktop/character-map/[email protected]
+consolidation/userland/userland-incorporation:desktop/[email protected]
+consolidation/userland/userland-incorporation:desktop/remote-desktop/[email protected]
+consolidation/userland/userland-incorporation:desktop/remote-desktop/[email protected]
+consolidation/userland/userland-incorporation:desktop/system-monitor/[email protected]
+consolidation/userland/userland-incorporation:developer/gnome/[email protected]
+consolidation/userland/userland-incorporation:developer/ui-designer/[email protected]
+consolidation/userland/userland-incorporation:documentation/gnome/[email protected]
+consolidation/userland/userland-incorporation:documentation/gnome/[email protected]
+consolidation/userland/userland-incorporation:editor/gedit/[email protected]
+consolidation/userland/userland-incorporation:editor/[email protected]
+consolidation/userland/userland-incorporation:gnome/accessibility/[email protected]
+consolidation/userland/userland-incorporation:gnome/accessibility/[email protected]
+consolidation/userland/userland-incorporation:gnome/accessibility/[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/applet/[email protected]
+consolidation/userland/userland-incorporation:gnome/config/gconf/[email protected]
+consolidation/userland/userland-incorporation:gnome/crash-report/[email protected]
+consolidation/userland/userland-incorporation:gnome/disk-analyzer/[email protected]
+consolidation/userland/userland-incorporation:gnome/file-manager/nautilus/extension/[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/[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/media/[email protected]
+consolidation/userland/userland-incorporation:gnome/security/seahorse/[email protected]
+consolidation/userland/userland-incorporation:gnome/security/[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/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/[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:gnome/[email protected]
+consolidation/userland/userland-incorporation:image/editor/gimp/[email protected]
+consolidation/userland/userland-incorporation:image/editor/gimp/plugin/[email protected]
+consolidation/userland/userland-incorporation:image/editor/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/library/[email protected]
+consolidation/userland/userland-incorporation:image/viewer/eog/[email protected]
+consolidation/userland/userland-incorporation:image/viewer/[email protected]
+consolidation/userland/userland-incorporation:library/accessibility/[email protected]
+consolidation/userland/userland-incorporation:library/audio/[email protected]
+consolidation/userland/userland-incorporation:library/c++/[email protected]
+consolidation/userland/userland-incorporation:library/c++/[email protected]
+consolidation/userland/userland-incorporation:library/desktop/[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/[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/[email protected]
+consolidation/userland/userland-incorporation:library/media-player/[email protected]
+consolidation/userland/userland-incorporation:library/musicbrainz/[email protected]
+consolidation/userland/userland-incorporation:library/musicbrainz/[email protected]
+consolidation/userland/userland-incorporation:library/myspell/dictionary/[email protected]
+consolidation/userland/userland-incorporation:library/myspell/dictionary/[email protected]
+consolidation/userland/userland-incorporation:library/myspell/dictionary/[email protected]
+consolidation/userland/userland-incorporation:library/myspell/dictionary/[email protected]
+consolidation/userland/userland-incorporation:library/myspell/dictionary/[email protected]
+consolidation/userland/userland-incorporation:library/myspell/dictionary/[email protected]
+consolidation/userland/userland-incorporation:library/myspell/dictionary/[email protected]
+consolidation/userland/userland-incorporation:library/python/[email protected]
+consolidation/userland/userland-incorporation:library/[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/spell-checking/[email protected]
+consolidation/userland/userland-incorporation:library/xdg/[email protected]
+consolidation/userland/userland-incorporation:print/cups/[email protected]
+consolidation/userland/userland-incorporation:release/[email protected]
+consolidation/userland/userland-incorporation:service/gnome/[email protected]
+consolidation/userland/userland-incorporation:service/[email protected]
+consolidation/userland/userland-incorporation:storage/[email protected]
+consolidation/userland/userland-incorporation:system/display-manager/[email protected]
+consolidation/userland/userland-incorporation:system/display-manager/[email protected]
+consolidation/userland/userland-incorporation:system/library/dbus/[email protected]
+consolidation/userland/userland-incorporation:system/library/[email protected]
+consolidation/userland/userland-incorporation:system/library/[email protected]
+consolidation/userland/userland-incorporation:system/library/[email protected]
+consolidation/userland/userland-incorporation:terminal/[email protected]
+consolidation/userland/userland-incorporation:terminal/[email protected]
--- a/doc/packaging.txt	Wed Mar 09 15:02:59 2016 -0800
+++ b/doc/packaging.txt	Wed Mar 09 16:26:11 2016 -0800
@@ -223,6 +223,13 @@
       modules, including the two mentioned above, have such files which can
       serve as examples.
 
+      By default, packages created from the history files will be part of
+      the userland-incorporation.  If a package needs to be included in a
+      different incorporation, then incorporate=INCORPORATION may be
+      placed on the end of either the rename or obsoletion line.
+      Examples with incorporate=consolidation/desktop/gnome-incorporation
+      may be found in components/meta-packages/history/history.
+
     So far, not too bad.  This gets slightly more complicated when back-
     porting in that BUILD needs to be set to the back-port build (e.g.,
     "5.11-0.175.3.0.0.8.0", as was the case for tkinter-27) rather than
--- a/tools/generate-history	Wed Mar 09 15:02:59 2016 -0800
+++ b/tools/generate-history	Wed Mar 09 16:26:11 2016 -0800
@@ -17,12 +17,21 @@
     continue
   }
   printf "set name=pkg.fmri value=pkg:/%s\n", fmri
+  if ($NF ~ /^incorporate=/) {
+    incorporate=$NF;
+    NF--;
+  }
   if (NF == 2) {
     print "set name=pkg.renamed value=true"
     printf "depend type=require fmri=%s\n", $2
   } else {
     print "set name=pkg.obsolete value=true"
   }
-  print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)"
+  if (incorporate) {
+    printf "set name=org.opensolaris.consolidation %s value=$(CONSOLIDATION)\n",
+      incorporate
+  } else {
+    print "set name=org.opensolaris.consolidation value=$(CONSOLIDATION)"
+  }
   exit 0 # We're done; no point continuing.
 }
--- a/tools/userland-incorporator	Wed Mar 09 15:02:59 2016 -0800
+++ b/tools/userland-incorporator	Wed Mar 09 16:26:11 2016 -0800
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # incorporator - an utility to incorporate packages in a repo
@@ -84,17 +84,48 @@
 # a stable and less complicated interface to gathering information from the
 # manifests in the package repo.
 #
-def get_incorporations(repository, publisher, inc_version='5.12'):
-    tmp = subprocess.Popen(["/usr/bin/pkgrepo", "list", "-F", "json",
-                                                        "-s", repository,
-                                                        "-p", publisher],
-                           stdout=subprocess.PIPE)
+def get_incorporations(repository, publisher, inc_version='5.12',
+		       static_file=None):
+    packages = {}
     incorporations = {}
-    packages = json.load(tmp.stdout)
+    versions = {}
+
+    #
+    # if a static file was provided, prime the cache with the contents of
+    # that file.
+    #
+    if static_file:
+        with open(static_file, 'r') as fp:
+          for line in fp:
+            line = line.partition('#')[0]
+            line = line.rstrip()
 
+            try:
+                (incorporation, package, version) = re.split(':|@', line)
+            except ValueError:
+                pass
+            else:
+                if incorporation not in incorporations:
+                    incorporations[incorporation] = Incorporation(incorporation, inc_version)
+                # find the incorporation and add the package
+                tmp = incorporations[incorporation]
+                tmp.add_package(package, version)
+                versions[package] = version
+
+    #
+    # Load the repository for packages to incorporate.
+    #
+    if repository:
+        tmp = subprocess.Popen(["/usr/bin/pkgrepo", "list", "-F", "json",
+                                                            "-s", repository,
+                                                            "-p", publisher],
+                               stdout=subprocess.PIPE)
+        packages = json.load(tmp.stdout)
+
+    #
     # Check for multiple versions of packages in the repo, but keep track of
     # the latest one.
-    versions = {}
+    #
     for package in packages:
         pkg_name = package['name']
         pkg_version = package['version']
@@ -104,6 +135,9 @@
             pkg_version = max(pkg_version, versions[pkg_name])
         versions[pkg_name] = pkg_version
 
+    #
+    # Add published packages to the incorporation lists
+    #
     for package in packages:
         pkg_name = package['name']
         pkg_version = package['version']
@@ -122,18 +156,21 @@
             # find the incorporation and add the package
             tmp = incorporations[inc_name]
             tmp.add_package(pkg_name, pkg_version)
+
     return incorporations
 
 def main_func():
     global Werror
 
     try: 
-        opts, pargs = getopt.getopt(sys.argv[1:], "c:s:p:v:d:w",
+        opts, pargs = getopt.getopt(sys.argv[1:], "S:c:s:p:v:d:w",
                                     ["repository=", "publisher=", "version=",
-                                     "consolidation=", "destdir=", "Werror"])
+                                     "consolidation=", "destdir=", "Werror",
+				     "static-content-file="])
     except getopt.GetoptError, e:
         usage(_("illegal option: %s") % e.opt)
 
+    static_file = None
     repository = None
     publisher = None
     version = None
@@ -141,7 +178,9 @@
     consolidation = None
 
     for opt, arg in opts:
-        if opt in ("-s", "--repository"):
+        if opt in ("-S", "--static-content-file"):
+            static_file = arg
+        elif opt in ("-s", "--repository"):
             repository = arg
         elif opt in ("-p", "--publisher"):
             publisher = arg
@@ -154,7 +193,8 @@
         elif opt in ("-w", "--Werror"):
             Werror = True
 
-    incorporations = get_incorporations(repository, publisher, version)
+    incorporations = get_incorporations(repository, publisher, version,
+                                        static_file)
 
     for incorporation_name in incorporations.keys():
         filename = ''
upstream/oracle/userland-gate