17015 Visual Panels should be delivered via a native IPS repo
17016 Removal of dependency on obsolete opensolaris-gdm-themes in wrong manifest
--- a/src/pkg/manifests/system%2Ftrusted%2Ftrusted-nonglobal.p5m Thu Sep 09 18:08:00 2010 -0700
+++ b/src/pkg/manifests/system%2Ftrusted%2Ftrusted-nonglobal.p5m Fri Sep 10 10:29:41 2010 -0700
@@ -44,8 +44,8 @@
depend fmri=pkg:/gnome/help-viewer/yelp type=require
depend fmri=pkg:/gnome/media/gnome-media type=require
depend fmri=pkg:/gnome/media/gnome-media-player type=require
-depend fmri=pkg:/gnome/theme/background/opensolaris-backgrounds type=require
-depend fmri=pkg:/gnome/theme/background/opensolaris-backgrounds-extra type=require
+depend fmri=pkg:/gnome/theme/background/os-backgrounds type=require
+depend fmri=pkg:/gnome/theme/background/os-backgrounds-extra type=require
depend fmri=pkg:/gnome/theme/blueprint type=require
depend fmri=pkg:/gnome/theme/cursor/dmz-cursor type=require
depend fmri=pkg:/gnome/theme/cursor/dmz-cursor-aa type=require
@@ -71,7 +71,6 @@
depend fmri=pkg:/mail/thunderbird/plugin/thunderbird-lightning type=require
depend fmri=pkg:/package/pkg/package-manager type=require
depend fmri=pkg:/package/svr4 type=require
-depend fmri=pkg:/system/display-manager/opensolaris-gdm-themes type=require
depend fmri=pkg:/system/font/isas-misc type=require
depend fmri=pkg:/system/font/truetype/bh-luxi type=require
depend fmri=pkg:/system/font/truetype/dejavu type=require
--- a/src/util/distro-import/148/common/TrustedNonGlobal Thu Sep 09 18:08:00 2010 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-package system/trusted/trusted-nonglobal
-consolidation "ips"
-classification "System/Trusted"
-summary "Trusted Extensions labeled zone"
-depend communication/im/pidgin
-depend desktop/administration/gnome-system-tools
-depend desktop/archive-manager/file-roller
-depend desktop/calculator/gcalctool
-depend desktop/pdf-viewer/evince
-depend desktop/system-monitor/gnome-system-monitor
-depend desktop/xdg/menu-editor/alacarte
-depend developer/gnome/gnome-doc-utils
-depend documentation/gnome/gnome-user-docs
-depend editor/gedit
-depend games/gnome-games
-depend gnome/config/gconf
-depend gnome/file-manager/nautilus
-depend gnome/ggv
-depend gnome/gnome-audio
-depend gnome/gnome-dictionary
-depend gnome/gnome-search-tool
-depend gnome/help-viewer/yelp
-depend gnome/media/gnome-media
-depend gnome/media/gnome-media-player
-depend gnome/theme/background/os-backgrounds
-depend gnome/theme/background/os-backgrounds-extra
-depend gnome/theme/blueprint
-depend gnome/theme/cursor/dmz-cursor
-depend gnome/theme/cursor/dmz-cursor-aa
-depend gnome/theme/gnome-icon-theme
-depend gnome/theme/gnome-themes
-depend gnome/theme/gnome-themes-extra
-depend gnome/theme/gtk2-engines
-depend gnome/theme/gtk2-engines-extra
-depend gnome/theme/hicolor-icon-theme
-depend gnome/theme/nimbus
-depend gnome/theme/nimbus-hires
-depend gnome/theme/tango-icon-theme
-depend gnome/trusted/trusted-stripe
-depend gnome/trusted/xagent
-depend gnome/zenity
-depend image/gnome-backgrounds
-depend image/viewer/eog
-depend image/viewer/gthumb
-depend library/gnome/gnome-component
-depend library/gnome/print/gnome-print
-depend library/spell-checking/enchant
-depend mail/thunderbird
-depend mail/thunderbird/plugin/thunderbird-lightning
-depend package/pkg/package-manager
-depend package/svr4
-depend system/font/isas-misc
-depend system/font/truetype/bh-luxi
-depend system/font/truetype/dejavu
-depend system/font/truetype/liberation
-depend system/font/xorg/iso8859-1
-depend system/font/xorg/iso8859-15
-depend system/font/xorg/xorg-core
-depend system/library/dbus
-depend system/locale/en_us
-depend system/trusted
-depend terminal/gnome-terminal
-depend x11/trusted/libxtsol
-end package
--- a/src/util/distro-import/148/redist_cluster Thu Sep 09 18:08:00 2010 -0700
+++ b/src/util/distro-import/148/redist_cluster Fri Sep 10 10:29:41 2010 -0700
@@ -558,8 +558,6 @@
include common/system:management:freeipmi
include common/system:management:powerman
include common/system:management:snmp:net-snmp:addons
-include common/system:management:visual-panels:panel-apache
-include common/system:management:visual-panels:panel-sysid
include common/system:management:wbem:cimple
include common/system:management:wbem:sblim-cim-client
include common/system:management:wbem:wbemcli
@@ -640,7 +638,6 @@
$(i386_ONLY)include i386/editor:blog:drivel
$(i386_ONLY)include i386/image:nvidia:cg-toolkit
$(i386_ONLY)include i386/system:library:libvirt
-$(i386_ONLY)include i386/system:management:visual-panels:panel-hypervisor
$(i386_ONLY)include i386/system:storage:vdiskadm
$(i386_ONLY)include i386/system:virtinst
$(i386_ONLY)include i386/system:xvm:header-xvm
@@ -649,7 +646,6 @@
$(i386_ONLY)include common/FSWfontconfig-devel-docs
$(i386_ONLY)include common/FSWxorg-devel-docs
$(i386_ONLY)include common/FSWxwpft
-include common/OSOLvpanels-mysql
$(i386_ONLY)include common/SUNWadmc
$(i386_ONLY)include common/SUNWaspell
$(i386_ONLY)include common/SUNWaspell-en
--- a/src/util/distro-import/148/slim_cluster Thu Sep 09 18:08:00 2010 -0700
+++ b/src/util/distro-import/148/slim_cluster Fri Sep 10 10:29:41 2010 -0700
@@ -395,9 +395,6 @@
include common/system:management:snmp:net-snmp
include common/system:management:snmp:net-snmp:documentation
include common/system:management:sysidtool
-include common/system:management:visual-panels
-include common/system:management:visual-panels:panel-firewall
-include common/system:management:visual-panels:panel-sharemgr
include common/system:manual
include common/system:manual:locale:ca
include common/system:manual:locale:ja
--- a/src/util/distro-import/Makefile Thu Sep 09 18:08:00 2010 -0700
+++ b/src/util/distro-import/Makefile Fri Sep 10 10:29:41 2010 -0700
@@ -48,6 +48,7 @@
INSTALL_REPO=http://localhost:20001
X_REPO=http://localhost:20002
IPS_REPO=http://localhost:20003
+VPANELS_REPO=http://localhost:20004
BUILDID_NORESPIN=/usr/bin/echo $(BUILDID) | sed -e 's/\([0-9]\)[a-z]*$$/\1/g'
@@ -104,6 +105,11 @@
-R $(IPS_REPO)@consolidation/ips/[email protected].$(BUILDID) \
-E consolidation/ips/[email protected].$(BUILDID)
+VPANELS_CONSOLIDATION_OPTIONS = \
+ -C vpanels \
+ -R $(VPANELS_REPO)@consolidation/vpanels/[email protected].$(BUILDID) \
+ -E consolidation/vpanels/[email protected].$(BUILDID)
+
CONSOLIDATION_OPTIONS_136 = \
$(OSNET_CONSOLIDATION_OPTIONS)
CONSOLIDATION_OPTIONS_137 = $(CONSOLIDATION_OPTIONS_136)
@@ -120,7 +126,8 @@
$(IPS_CONSOLIDATION_OPTIONS)
CONSOLIDATION_OPTIONS_146 = $(CONSOLIDATION_OPTIONS_145)
CONSOLIDATION_OPTIONS_147 = $(CONSOLIDATION_OPTIONS_145)
-CONSOLIDATION_OPTIONS_148 = $(CONSOLIDATION_OPTIONS_145)
+CONSOLIDATION_OPTIONS_148 = $(CONSOLIDATION_OPTIONS_145) \
+ $(VPANELS_CONSOLIDATION_OPTIONS)
CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
GLOBAL_CHATTRS_BASE= \
--- a/src/util/publish/Makefile Thu Sep 09 18:08:00 2010 -0700
+++ b/src/util/publish/Makefile Fri Sep 10 10:29:41 2010 -0700
@@ -29,6 +29,7 @@
INSTALL_REPO=http://localhost:20001
X_REPO=http://localhost:20002
IPS_REPO=http://localhost:20003
+VPANELS_REPO=http://localhost:20004
MERGEDIR=../../../proto/merge
SETPUBLISHERDIR=../../../proto/set-publisher
PROTO=../../../proto/root_$(ARCH)
@@ -67,7 +68,8 @@
$(ON_REPO) \
$(INSTALL_REPO) \
$(X_REPO) \
- $(IPS_REPO)
+ $(IPS_REPO) \
+ $(VPANELS_REPO)
clean: