--- a/src/pkg/manifests/consolidation:ips:ips-message-files.p5m	Fri Aug 17 10:35:34 2012 -0700
+++ b/src/pkg/manifests/consolidation:ips:ips-message-files.p5m	Fri Aug 17 17:04:48 2012 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 #

--- a/src/pkg/manifests/group:feature:multi-user-desktop.p5m	Fri Aug 17 10:35:34 2012 -0700
+++ b/src/pkg/manifests/group:feature:multi-user-desktop.p5m	Fri Aug 17 17:04:48 2012 -0700
@@ -180,7 +180,20 @@
 depend type=group fmri=system/io/audio
 depend type=group fmri=system/keyboard/kbd_mode
 depend type=group fmri=system/locale/support
-depend type=group fmri=system/management/visual-panels
+#
+# Include the same panels that are delivered by
+# group/system/solaris-desktop.  Those should be the panels that match
+# the underlying technologies included with the desktop group package.
+#
+depend type=group fmri=system/management/visual-panels-core
+depend type=group fmri=system/management/visual-panels/panel-apache
+depend type=group fmri=system/management/visual-panels/panel-coreadm
+depend type=group fmri=system/management/visual-panels/panel-firewall
+depend type=group fmri=system/management/visual-panels/panel-smf
+depend type=group fmri=system/management/visual-panels/panel-sysmon
+depend type=group fmri=system/management/visual-panels/panel-time
+depend type=group fmri=system/management/visual-panels/panel-usermgr
+depend type=group fmri=system/management/visual-panels/panel-zconsole
 depend type=group fmri=system/network/avahi
 $(i386_ONLY)depend type=group fmri=system/storage/parted
 depend type=group fmri=terminal/fbconsole

--- a/src/pkg/manifests/package:pkg.p5m	Fri Aug 17 10:35:34 2012 -0700
+++ b/src/pkg/manifests/package:pkg.p5m	Fri Aug 17 17:04:48 2012 -0700
@@ -24,22 +24,27 @@
 set name=pkg.fmri value=pkg:/package/pkg@$(PKGVERS)
 set name=pkg.summary value="Image Packaging System"
 set name=pkg.description \
-    value="The Image Packaging System (IPS), or pkg(5), is the software delivery system used on OpenSolaris systems.  This package contains the core command-line components and depot server."
-
-# XXX needed due to bug 18673
-set name=pkg.linted.pkglint.manifest003.1 value=true
+    value="The Image Packaging System (IPS), or pkg(5), is the software delivery system used on Oracle Solaris.  This package contains the core command-line components and depot server."
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 set name=variant.arch value=$(ARCH)
 dir  path=$(PYDIR)
 dir  path=$(PYDIRVP)
 dir  path=$(PYDIRVP)/pkg
+file path=$(PYDIRVP)/pkg-0.1-py2.6.egg-info
 dir  path=$(PYDIRVP)/pkg/64
-file path=$(PYDIRVP)/pkg-0.1-py2.6.egg-info
+file path=$(PYDIRVP)/pkg/64/_varcet.so
 file path=$(PYDIRVP)/pkg/__init__.py
 file path=$(PYDIRVP)/pkg/_varcet.so
-file path=$(PYDIRVP)/pkg/64/_varcet.so
 dir  path=$(PYDIRVP)/pkg/actions
+#
+# We ship a 64-bit version of _actions.so because it's
+# needed by the sysrepo_p5p which is a mod_wsgi application
+# that runs in a 64-bit apache instance.
+#
+dir  path=$(PYDIRVP)/pkg/actions/64
+file path=$(PYDIRVP)/pkg/actions/64/_actions.so
+file path=$(PYDIRVP)/pkg/actions/64/_common.so
 file path=$(PYDIRVP)/pkg/actions/__init__.py
 file path=$(PYDIRVP)/pkg/actions/_actions.so
 file path=$(PYDIRVP)/pkg/actions/_common.so
@@ -57,12 +62,6 @@
 file path=$(PYDIRVP)/pkg/actions/signature.py
 file path=$(PYDIRVP)/pkg/actions/unknown.py
 file path=$(PYDIRVP)/pkg/actions/user.py
-# We ship a 64-bit version of _actions.so because it's
-# needed by the sysrepo_p5p which is a mod_wsgi application
-# that runs in a 64-bit apache instance.
-dir  path=$(PYDIRVP)/pkg/actions/64
-file path=$(PYDIRVP)/pkg/actions/64/_actions.so
-file path=$(PYDIRVP)/pkg/actions/64/_common.so
 file path=$(PYDIRVP)/pkg/altroot.py
 file path=$(PYDIRVP)/pkg/api_common.py
 file path=$(PYDIRVP)/pkg/arch.so
@@ -80,8 +79,10 @@
 file path=$(PYDIRVP)/pkg/client/actuator.py
 file path=$(PYDIRVP)/pkg/client/api.py
 file path=$(PYDIRVP)/pkg/client/api_errors.py
+#
 # Don't worry about the libbe import; the python code looks for it in case
 # it can't import libbe_py, and is graceful in the face of its absence.
+#
 file path=$(PYDIRVP)/pkg/client/bootenv.py pkg.depend.bypass-generate=.*libbe.*
 file path=$(PYDIRVP)/pkg/client/debugvalues.py
 file path=$(PYDIRVP)/pkg/client/history.py

--- a/src/pkg/manifests/package:pkg:system-repository.p5m	Fri Aug 17 10:35:34 2012 -0700
+++ b/src/pkg/manifests/package:pkg:system-repository.p5m	Fri Aug 17 17:04:48 2012 -0700
@@ -20,6 +20,7 @@
 #
 # Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 #
+
 set name=pkg.fmri value=pkg:/package/pkg/system-repository@$(PKGVERS)
 set name=pkg.summary value="IPS System Repository"
 set name=pkg.description \
@@ -31,8 +32,8 @@
 dir  path=etc/pkg
 dir  path=etc/pkg/sysrepo
 file path=etc/pkg/sysrepo/sysrepo_httpd.conf.mako
+file path=etc/pkg/sysrepo/sysrepo_p5p.py pkg.tmp.autopyc=false
 file path=etc/pkg/sysrepo/sysrepo_publisher_response.mako
-file path=etc/pkg/sysrepo/sysrepo_p5p.py pkg.tmp.autopyc=false
 dir  path=lib
 dir  path=lib/svc
 dir  path=lib/svc/manifest
@@ -59,8 +60,10 @@
 file path=var/log/pkg/sysrepo/access_log preserve=renamenew
 file path=var/log/pkg/sysrepo/error_log preserve=renamenew
 license cr_Oracle license=cr_Oracle
+#
 # The manual dependency on apache results from our calling apachectl from
 # our method script, and can't be detected by pkgdepend.
+#
 depend type=require fmri=web/server/apache-22
 # p5p support in the system repository requires mod_wsgi
 depend type=require fmri=web/server/apache-22/module/apache-wsgi-26

--- a/src/pkg/manifests/package:pkg:update-manager.p5m	Fri Aug 17 10:35:34 2012 -0700
+++ b/src/pkg/manifests/package:pkg:update-manager.p5m	Fri Aug 17 17:04:48 2012 -0700
@@ -25,9 +25,6 @@
 set name=pkg.summary value="Update Manager for Image Packaging System"
 set name=pkg.description \
     value="The Update Manager is a simplified graphical interface to the Image Packaging System which simply updates all packages installed on your system.  There is also a desktop widget which notifies you when updates are available."
-
-# XXX needed due to bug 18673
-set name=pkg.linted.pkglint.manifest003.1 value=true
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 set name=variant.arch value=$(ARCH)