23169638 Move atk to Userland and update to 2.18.0
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 25 Apr 2016 23:38:12 -0700
changeset 5894 bfe6c718eff5
parent 5893 2a56e1b60ff1
child 5895 742f50b07db0
23169638 Move atk to Userland and update to 2.18.0 PSARC/2016/241 atk 2.18.0
components/gnome/atk/Makefile
components/gnome/atk/atk.p5m
components/gnome/atk/test/results-all.master
components/meta-packages/incorporation-cache
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/atk/Makefile	Mon Apr 25 23:38:12 2016 -0700
@@ -0,0 +1,61 @@
+#
+# 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.
+#
+
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+COMPILER =      	gcc
+BUILD_BITS =            32_and_64
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		atk
+COMPONENT_VERSION=	2.18.0
+COMPONENT_PROJECT_URL=	https://wiki.gnome.org/Accessibility
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:ce6c48d77bf951083029d5a396dd552d836fff3c1715d3a7022e917e46d0c92b
+COMPONENT_BUGDB=	gnome/a11y-libs-core
+
+TPNO=			24624
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Workaround for build failures due to atk Makefiles not passing CFLAGS or
+# LDFLAGS, especially the -m32/64 flag, to g-ir-scanner
+COMPONENT_BUILD_ENV += CFLAGS="$(strip $(CFLAGS))"
+COMPONENT_BUILD_ENV += LDFLAGS="$(strip $(LDFLAGS))"
+
+# Upstream's "gmake test" target builds tests but does not run them,
+# so run them manually for now.
+COMPONENT_TEST_TARGETS += ; cd tests; ./testdocument; ./testrole ; \
+	./testrelation ; ./teststateset ; ./testvalue
+
+COMPONENT_TEST_MASTER = $(COMPONENT_TEST_RESULTS_DIR)/results-all.master
+
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --disable-silent-rules
+
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/atk/atk.p5m	Mon Apr 25 23:38:12 2016 -0700
@@ -0,0 +1,185 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+    value=pkg:/library/desktop/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Provides the set of accessibility interfaces that are implemented by other toolkits and applications."
+set name=pkg.description \
+    value="ATK provides the set of accessibility interfaces that are implemented by other toolkits and applications. Using the ATK interfaces, accessibility tools have full access to view and control running applications."
+set name=com.oracle.info.description value=atk
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Desktop (GNOME)/Libraries"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2001/650 value=PSARC/2016/241
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/include/atk-1.0/atk/atk-enum-types.h
+file path=usr/include/atk-1.0/atk/atk.h
+file path=usr/include/atk-1.0/atk/atkaction.h
+file path=usr/include/atk-1.0/atk/atkcomponent.h
+file path=usr/include/atk-1.0/atk/atkdocument.h
+file path=usr/include/atk-1.0/atk/atkeditabletext.h
+file path=usr/include/atk-1.0/atk/atkgobjectaccessible.h
+file path=usr/include/atk-1.0/atk/atkhyperlink.h
+file path=usr/include/atk-1.0/atk/atkhyperlinkimpl.h
+file path=usr/include/atk-1.0/atk/atkhypertext.h
+file path=usr/include/atk-1.0/atk/atkimage.h
+file path=usr/include/atk-1.0/atk/atkmisc.h
+file path=usr/include/atk-1.0/atk/atknoopobject.h
+file path=usr/include/atk-1.0/atk/atknoopobjectfactory.h
+file path=usr/include/atk-1.0/atk/atkobject.h
+file path=usr/include/atk-1.0/atk/atkobjectfactory.h
+file path=usr/include/atk-1.0/atk/atkplug.h
+file path=usr/include/atk-1.0/atk/atkrange.h
+file path=usr/include/atk-1.0/atk/atkregistry.h
+file path=usr/include/atk-1.0/atk/atkrelation.h
+file path=usr/include/atk-1.0/atk/atkrelationset.h
+file path=usr/include/atk-1.0/atk/atkrelationtype.h
+file path=usr/include/atk-1.0/atk/atkselection.h
+file path=usr/include/atk-1.0/atk/atksocket.h
+file path=usr/include/atk-1.0/atk/atkstate.h
+file path=usr/include/atk-1.0/atk/atkstateset.h
+file path=usr/include/atk-1.0/atk/atkstreamablecontent.h
+file path=usr/include/atk-1.0/atk/atktable.h
+file path=usr/include/atk-1.0/atk/atktablecell.h
+file path=usr/include/atk-1.0/atk/atktext.h
+file path=usr/include/atk-1.0/atk/atkutil.h
+file path=usr/include/atk-1.0/atk/atkvalue.h
+file path=usr/include/atk-1.0/atk/atkversion.h
+file path=usr/include/atk-1.0/atk/atkwindow.h
+file path=usr/lib/$(MACH64)/girepository-1.0/Atk-1.0.typelib
+link path=usr/lib/$(MACH64)/libatk-1.0.so target=libatk-1.0.so.0.21809.1
+link path=usr/lib/$(MACH64)/libatk-1.0.so.0 target=libatk-1.0.so.0.21809.1
+file path=usr/lib/$(MACH64)/libatk-1.0.so.0.21809.1
+file path=usr/lib/$(MACH64)/pkgconfig/atk.pc
+file path=usr/lib/girepository-1.0/Atk-1.0.typelib
+link path=usr/lib/libatk-1.0.so target=libatk-1.0.so.0.21809.1
+link path=usr/lib/libatk-1.0.so.0 target=libatk-1.0.so.0.21809.1
+file path=usr/lib/libatk-1.0.so.0.21809.1
+file path=usr/lib/pkgconfig/atk.pc
+file path=usr/share/gir-1.0/Atk-1.0.gir
+file path=usr/share/locale/af/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/am/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/an/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ar/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/as/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ast/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/az/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/be/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/bg/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/bn/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/bs/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ca/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/cs/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/cy/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/da/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/de/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/dz/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/el/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/en_CA/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/eo/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/es/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/et/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/eu/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/fa/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/fi/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/fr/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ga/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/gl/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/gu/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/he/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/hi/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/hr/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/hu/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/hy/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/id/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/is/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/it/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ja/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ka/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/kk/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/km/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/kn/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ko/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ku/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/li/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/lt/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/lv/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/mai/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/mk/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ml/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/mn/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/mr/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ms/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/nb/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ne/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/nl/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/nn/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/oc/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/or/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/pa/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/pl/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ps/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/pt/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ro/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ru/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/rw/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/si/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/sk/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/sl/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/sq/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/sr/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/sv/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ta/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/te/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/tg/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/th/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/tk/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/tr/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/tt/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/ug/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/uk/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/vi/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/wa/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/xh/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/yi/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/atk10.mo
+file path=usr/share/locale/zu/LC_MESSAGES/atk10.mo
+license COPYING license=LGPLv2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/gnome/atk/test/results-all.master	Mon Apr 25 23:38:12 2016 -0700
@@ -0,0 +1,230 @@
+make[1]: Entering directory '$(@D)'
+Making check in atk
+make[2]: Entering directory '$(@D)/atk'
+/usr/gnu/bin/make  check-am
+make[3]: Entering directory '$(@D)/atk'
+make[3]: Leaving directory '$(@D)/atk'
+make[2]: Leaving directory '$(@D)/atk'
+Making check in tests
+make[2]: Entering directory '$(@D)/tests'
+make[2]: Nothing to be done for 'check'.
+make[2]: Leaving directory '$(@D)/tests'
+Making check in docs
+make[2]: Entering directory '$(@D)/docs'
+make[2]: Nothing to be done for 'check'.
+make[2]: Leaving directory '$(@D)/docs'
+Making check in po
+make[2]: Entering directory '$(@D)/po'
+make[2]: Nothing to be done for 'check'.
+make[2]: Leaving directory '$(@D)/po'
+Making check in build
+make[2]: Entering directory '$(@D)/build'
+Making check in win32
+make[3]: Entering directory '$(@D)/build/win32'
+Making check in vs9
+make[4]: Entering directory '$(@D)/build/win32/vs9'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/build/win32/vs9'
+Making check in vs10
+make[4]: Entering directory '$(@D)/build/win32/vs10'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/build/win32/vs10'
+Making check in vs11
+make[4]: Entering directory '$(@D)/build/win32/vs11'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/build/win32/vs11'
+Making check in vs12
+make[4]: Entering directory '$(@D)/build/win32/vs12'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/build/win32/vs12'
+Making check in vs14
+make[4]: Entering directory '$(@D)/build/win32/vs14'
+make[4]: Nothing to be done for 'check'.
+make[4]: Leaving directory '$(@D)/build/win32/vs14'
+make[4]: Entering directory '$(@D)/build/win32'
+make[4]: Nothing to be done for 'check-am'.
+make[4]: Leaving directory '$(@D)/build/win32'
+make[3]: Leaving directory '$(@D)/build/win32'
+make[3]: Entering directory '$(@D)/build'
+make[3]: Nothing to be done for 'check-am'.
+make[3]: Leaving directory '$(@D)/build'
+make[2]: Leaving directory '$(@D)/build'
+make[2]: Entering directory '$(@D)'
+make[2]: Leaving directory '$(@D)'
+make[1]: Leaving directory '$(@D)'
+Starting Document test suite
+Moving to next page. Emitting page-change, page_number = 1
+Page-changed callback, page_number = 1
+Moving to next page. Emitting page-change, page_number = 2
+Page-changed callback, page_number = 2
+Moving to next page. Emitting page-change, page_number = 3
+Page-changed callback, page_number = 3
+Moving to next page. Emitting page-change, page_number = 4
+Page-changed callback, page_number = 4
+Moving to next page. Emitting page-change, page_number = 5
+Page-changed callback, page_number = 5
+Document tests succeeded
+Starting Role test suite
+(Role, name, localized name) defined by the ATK library:
+(0, invalid, invalid)
+(1, accelerator label, accelerator label)
+(2, alert, alert)
+(3, animation, animation)
+(4, arrow, arrow)
+(5, calendar, calendar)
+(6, canvas, canvas)
+(7, check box, check box)
+(8, check menu item, check menu item)
+(9, color chooser, color chooser)
+(10, column header, column header)
+(11, combo box, combo box)
+(12, date editor, date editor)
+(13, desktop icon, desktop icon)
+(14, desktop frame, desktop frame)
+(15, dial, dial)
+(16, dialog, dialog)
+(17, directory pane, directory pane)
+(18, drawing area, drawing area)
+(19, file chooser, file chooser)
+(20, filler, filler)
+(21, font chooser, font chooser)
+(22, frame, frame)
+(23, glass pane, glass pane)
+(24, html container, html container)
+(25, icon, icon)
+(26, image, image)
+(27, internal frame, internal frame)
+(28, label, label)
+(29, layered pane, layered pane)
+(30, list, list)
+(31, list item, list item)
+(32, menu, menu)
+(33, menu bar, menu bar)
+(34, menu item, menu item)
+(35, option pane, option pane)
+(36, page tab, page tab)
+(37, page tab list, page tab list)
+(38, panel, panel)
+(39, password text, password text)
+(40, popup menu, popup menu)
+(41, progress bar, progress bar)
+(42, push button, push button)
+(43, radio button, radio button)
+(44, radio menu item, radio menu item)
+(45, root pane, root pane)
+(46, row header, row header)
+(47, scroll bar, scroll bar)
+(48, scroll pane, scroll pane)
+(49, separator, separator)
+(50, slider, slider)
+(51, split pane, split pane)
+(52, spin button, spin button)
+(53, statusbar, statusbar)
+(54, table, table)
+(55, table cell, table cell)
+(56, table column header, table column header)
+(57, table row header, table row header)
+(58, tear off menu item, tear off menu item)
+(59, terminal, terminal)
+(60, text, text)
+(61, toggle button, toggle button)
+(62, tool bar, tool bar)
+(63, tool tip, tool tip)
+(64, tree, tree)
+(65, tree table, tree table)
+(66, unknown, unknown)
+(67, viewport, viewport)
+(68, window, window)
+(69, header, header)
+(70, footer, footer)
+(71, paragraph, paragraph)
+(72, ruler, ruler)
+(73, application, application)
+(74, autocomplete, autocomplete)
+(75, edit bar, edit bar)
+(76, embedded, embedded)
+(77, entry, entry)
+(78, chart, chart)
+(79, caption, caption)
+(80, document frame, document frame)
+(81, heading, heading)
+(82, page, page)
+(83, section, section)
+(84, redundant object, redundant object)
+(85, form, form)
+(86, link, link)
+(87, input method window, input method window)
+(88, table row, table row)
+(89, tree item, tree item)
+(90, document spreadsheet, document spreadsheet)
+(91, document presentation, document presentation)
+(92, document text, document text)
+(93, document web, document web)
+(94, document email, document email)
+(95, comment, comment)
+(96, list box, list box)
+(97, grouping, grouping)
+(98, image map, image map)
+(99, notification, notification)
+(100, info bar, info bar)
+(101, level bar, level bar)
+(102, title bar, title bar)
+(103, block quote, block quote)
+(104, audio, audio)
+(105, video, video)
+(106, definition, definition)
+(107, article, article)
+(108, landmark, landmark)
+(109, log, log)
+(110, marquee, marquee)
+(111, math, math)
+(112, rating, rating)
+(113, timer, timer)
+(114, description list, description list)
+(115, description term, description term)
+(116, description value, description value)
+(117, static, static)
+(118, math fraction, math fraction)
+(119, math root, math root)
+(120, subscript, subscript)
+(121, superscript, superscript)
+(Role, name, localized name) for the extra roles:
+Role tests succeeded
+Starting Relation test suite
+Relation tests succeeded
+Text Attribute tests succeeded
+Starting State Set test suite
+State Set tests succeeded
+State tests succeeded
+Starting Value test suite
+
+
+Current AtkValue data:
+	 (value,description)=(0.000000,low) 
+	 (min,max,description)=(0.000000, 1.000000, (null))
+	 minimum increment=0.150000
+		 sub_range0 = (0.000000, 0.200000, low)
+		 sub_range1 = (0.200000, 0.400000, medium)
+		 sub_range2 = (0.400000, 0.800000, high)
+		 sub_range3 = (0.800000, 1.000000, very high)
+value-changed callback=(0.150000,low)
+value-changed callback=(0.300000,medium)
+value-changed callback=(0.450000,high)
+value-changed callback=(0.600000,high)
+value-changed callback=(0.750000,high)
+value-changed callback=(0.900000,very high)
+value-changed callback=(1.000000,very high)
+
+
+Value tests succeeded
+
+
+value-changed callback=(0.000000,low)
+Current AtkValue data:
+	 (value,description)=(1.000000,very high) 
+	 (min,max,description)=(0.000000, 1.000000, (null))
+	 minimum increment=0.150000
+		 sub_range0 = (0.000000, 0.200000, low)
+		 sub_range1 = (0.200000, 0.400000, medium)
+		 sub_range2 = (0.400000, 0.800000, high)
+		 sub_range3 = (0.800000, 1.000000, very high)
--- a/components/meta-packages/incorporation-cache	Fri Apr 29 14:12:36 2016 -0700
+++ b/components/meta-packages/incorporation-cache	Mon Apr 25 23:38:12 2016 -0700
@@ -65,7 +65,6 @@
 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]