25087690 Remove more excess FOSS from Desktop gate [PSARC 2016/088 - b113 subset]
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Sun, 13 Nov 2016 18:15:35 -0800
changeset 7335 b64df384d866
parent 7334 95f9efb22a51
child 7336 1c99429f2647
25087690 Remove more excess FOSS from Desktop gate [PSARC 2016/088 - b113 subset] PSARC/2016/088 EOF of more excess FOSS from Desktop consolidation (scrubbing the decks harder)
components/meta-packages/history/history
components/meta-packages/incorporation-cache
--- a/components/meta-packages/history/history	Sun Nov 13 21:09:09 2016 -0800
+++ b/components/meta-packages/history/history	Sun Nov 13 18:15:35 2016 -0800
@@ -198,7 +198,7 @@
 [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.12-5.12.0.0.0.113.0
 [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]
@@ -211,8 +211,8 @@
 [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.12-5.12.0.0.0.113.0 incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.113.0
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 desktop/archive-manager/[email protected]
@@ -224,7 +224,7 @@
 [email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.97.0
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 desktop/cd-burning/[email protected]
[email protected],5.12-5.12.0.0.0.113.0
 [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
@@ -248,7 +248,7 @@
 [email protected],5.11-0.175.0.0.0.0.0
 [email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.12-5.12.0.0.0.90.0
[email protected],5.11-0.175.0.0.0.0.0 library/desktop/[email protected] incorporate=consolidation/desktop/gnome-incorporation
[email protected],5.12-5.12.0.0.0.113.0 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
@@ -312,7 +312,7 @@
 [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.12-5.12.0.0.0.113.0 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]
@@ -354,7 +354,7 @@
 [email protected],5.11-0.175.0.0.0.0.0 documentation/gnome/[email protected]
 [email protected],5.12-5.12.0.0.0.112.0
 [email protected],5.11-0.175.0.0.0.0.0 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.12-5.12.0.0.0.113.0
 [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]
@@ -485,7 +485,7 @@
 [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.12-5.12.0.0.0.113.0
 [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
@@ -590,7 +590,7 @@
 [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.12-5.12.0.0.0.113.0
 [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]
@@ -650,7 +650,7 @@
 [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.12-5.12.0.0.0.113.0
 [email protected],5.12-5.12.0.0.0.97.0
 [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]
@@ -766,6 +766,7 @@
 desktop/administration/[email protected],5.12-5.12.0.0.0.109.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-burning/[email protected],5.12-5.12.0.0.0.113.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
@@ -775,6 +776,7 @@
 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/[email protected],5.12-5.12.0.0.0.113.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
@@ -881,6 +883,9 @@
 gnome/media/[email protected],5.12-5.12.0.0.0.112.0 gnome/preferences/[email protected] incorporate=consolidation/desktop/gnome-incorporation
 gnome/media/[email protected],5.12-5.12.0.0.0.112.0 gnome/media/totem
 gnome/media/[email protected]
+gnome/security/seahorse/[email protected],5.12-5.12.0.0.0.113.0
+gnome/speech/[email protected],5.12-5.12.0.0.0.113.0 incorporate=consolidation/desktop/gnome-incorporation
+gnome/speech/gnome-speech/driver/[email protected],5.12-5.12.0.0.0.113.0
 gnome/theme/background/[email protected] gnome/theme/background/[email protected]
 gnome/theme/background/[email protected] gnome/theme/background/[email protected]
 gnome/theme/[email protected],5.12-5.12.0.0.0.112.0
@@ -915,6 +920,7 @@
 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/window-manager/[email protected],5.12-5.12.0.0.0.113.0
 group/feature/[email protected]
 image/[email protected],5.12-5.12.0.0.0.90.0
 image/editor/[email protected]
@@ -949,6 +955,7 @@
 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/audio/[email protected],5.12-5.12.0.0.0.113.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
@@ -958,6 +965,7 @@
 library/desktop/[email protected],5.12-5.12.0.0.0.90.0
 library/desktop/gtk2/[email protected],5.11-0.175.0.0.0.0.0 incorporate=consolidation/desktop/gnome-incorporation
 library/desktop/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/desktop/[email protected],5.12-5.12.0.0.0.113.0 incorporate=consolidation/desktop/gnome-incorporation
 library/desktop/[email protected],5.12-5.12.0.0.0.112.0
 library/desktop/[email protected],5.11-0.175.0.0.0.0.0
 library/desktop/search/tracker/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
@@ -980,6 +988,7 @@
 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/libproxy/[email protected]
+library/[email protected],5.12-5.12.0.0.0.113.0
 library/musicbrainz/[email protected],5.12-5.12.0.0.0.112.0
 library/musicbrainz/[email protected],5.12-5.12.0.0.0.112.0
 library/myspell/dictionary/[email protected]
@@ -1069,8 +1078,10 @@
 library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
 library/python/[email protected],5.12-5.12.0.0.0.90.0
 library/python/[email protected],5.12-5.12.0.0.0.113.0 library/python/dbus-python-27
+library/python/[email protected],5.12-5.12.0.0.0.113.0
 library/python/[email protected]
 library/python/[email protected],5.12-5.12.0.0.0.112.0 incorporate=consolidation/desktop/gnome-incorporation
+library/python/[email protected],5.12-5.12.0.0.0.113.0
 library/python/[email protected]
 library/python/[email protected]
 library/python/[email protected]
@@ -1137,6 +1148,7 @@
 security/[email protected]
 security/[email protected]
 service/network/samba/[email protected]
+service/[email protected],5.12-5.12.0.0.0.113.0
 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
--- a/components/meta-packages/incorporation-cache	Sun Nov 13 21:09:09 2016 -0800
+++ b/components/meta-packages/incorporation-cache	Sun Nov 13 18:15:35 2016 -0800
@@ -44,9 +44,6 @@
 # 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:gnome/speech/[email protected]
-consolidation/desktop/gnome-incorporation:library/audio/[email protected]
-consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/desktop/[email protected]
 consolidation/desktop/gnome-incorporation:library/gnome/[email protected]
@@ -56,13 +53,4 @@
 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:desktop/cd-burning/[email protected]
-consolidation/userland/userland-incorporation:desktop/[email protected]
-consolidation/userland/userland-incorporation:gnome/security/seahorse/[email protected]
-consolidation/userland/userland-incorporation:gnome/speech/gnome-speech/driver/[email protected]
-consolidation/userland/userland-incorporation:gnome/window-manager/[email protected]
 consolidation/userland/userland-incorporation:image/library/[email protected]
-consolidation/userland/userland-incorporation:library/[email protected]
-consolidation/userland/userland-incorporation:library/python/[email protected]
-consolidation/userland/userland-incorporation:library/python/[email protected]
-consolidation/userland/userland-incorporation:service/[email protected]