--- a/src/pkg/license_files/cr_Oracle	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/license_files/cr_Oracle	Thu Oct 20 16:54:12 2011 -0700
@@ -1,1 +1,1 @@
-Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.

--- a/src/pkg/manifests/consolidation:ips:ips-incorporation.p5m	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/manifests/consolidation:ips:ips-incorporation.p5m	Thu Oct 20 16:54:12 2011 -0700
@@ -26,6 +26,9 @@
 set name=pkg.description \
     value="This incorporation constrains packages from the Image Packaging System consolidation."
 set name=pkg.depend.install-hold value=core-os.ips
+set name=com.oracle.service.bugid \
+    last-fmri=consolidation/ips/[email protected],5.11-0.151.0.1.7:20110526T000209Z \
+    value=7098585 value=7101660 value=7101910
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 

--- a/src/pkg/manifests/developer:opensolaris:pkg5.p5m	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/manifests/developer:opensolaris:pkg5.p5m	Thu Oct 20 16:54:12 2011 -0700
@@ -25,6 +25,9 @@
 set name=pkg.summary value="Dependencies required to build the pkg(5) project"
 set name=pkg.description \
     value="This package should be installed on systems used for development of the pkg(5) project"
+set name=com.oracle.service.bugid \
+    last-fmri=developer/opensolaris/[email protected],5.11-0.151.0.1:20101104T231611Z \
+    value=7098585 value=7101660
 set name=info.classification \
     value="org.opensolaris.category.2008:Development/Distribution Tools"
 depend type=require fmri=pkg:/developer/build/make

--- a/src/pkg/manifests/package:pkg.p5m	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/manifests/package:pkg.p5m	Thu Oct 20 16:54:12 2011 -0700
@@ -30,7 +30,7 @@
 set name=pkg.linted.pkglint.manifest003.1 value=true
 set name=com.oracle.service.bugid \
     last-fmri=package/[email protected],5.11-0.151.0.1.7:20110526T000204Z \
-    value=7098585
+    value=7098585 value=7101660 value=7102984 value=7102987
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 set name=variant.arch value=$(ARCH)
@@ -348,9 +348,9 @@
 license lic_gustaebel license=lic_gustaebel
 license lic_minisat license=lic_minisat
 depend type=exclude fmri=system/platform/exadata/firstrun \
-    facet.exclude.system/platform/exadata/firstrun=true
+    facet.exclude.exadata-firstrun=true
 depend type=exclude fmri=system/platform/exalogic/firstrun \
-    facet.exclude.system/platform/exalogic/firstrun=true
+    facet.exclude.exalogic-firstrun=true
 depend type=optional fmri=install/[email protected],5.11-0.151.0.1.13
 depend type=optional fmri=package/pkg/package-manager@$(PKGVERS)
 depend type=optional fmri=package/pkg/update-manager@$(PKGVERS)

--- a/src/pkg/manifests/package:pkg:package-manager.p5m	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/manifests/package:pkg:package-manager.p5m	Thu Oct 20 16:54:12 2011 -0700
@@ -25,6 +25,9 @@
 set name=pkg.summary value="GUI for Image Packaging System"
 set name=pkg.description \
     value="The graphical interface for the Image Packaging System allows you to perform many core packaging tasks in a user-friendly fashion."
+set name=com.oracle.service.bugid \
+    last-fmri=package/pkg/[email protected],5.11-0.151.0.1:20101104T233550Z \
+    value=7098585 value=7101660 value=7102984
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 set name=variant.arch value=$(ARCH)

--- a/src/pkg/manifests/package:pkg:update-manager.p5m	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/manifests/package:pkg:update-manager.p5m	Thu Oct 20 16:54:12 2011 -0700
@@ -28,6 +28,9 @@
 
 # XXX needed due to bug 18673
 set name=pkg.linted.pkglint.manifest003.1 value=true
+set name=com.oracle.service.bugid \
+    last-fmri=package/pkg/[email protected],5.11-0.151.0.1:20101104T233552Z \
+    value=7098585 value=7101660 value=7102984
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 set name=variant.arch value=$(ARCH)

--- a/src/pkg/manifests/system:trusted:trusted-nonglobal.p5m	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/manifests/system:trusted:trusted-nonglobal.p5m	Thu Oct 20 16:54:12 2011 -0700
@@ -25,6 +25,9 @@
 set name=pkg.summary value="Trusted Extensions labeled zone"
 set name=pkg.description \
     value="This package delivers the dependencies needed to install a Trusted Extensions labeled zone"
+set name=com.oracle.service.bugid \
+    last-fmri=system/trusted/[email protected],5.11-0.151.0.1:20101105T005729Z \
+    value=7098585 value=7101660
 set name=info.classification value=org.opensolaris.category.2008:System/Trusted
 depend type=require fmri=pkg:/communication/im/pidgin
 depend type=require fmri=pkg:/desktop/administration/gnome-system-tools

--- a/src/pkg/manifests/system:zones:brand:ipkg.p5m	Mon Oct 17 14:49:02 2011 -0700
+++ b/src/pkg/manifests/system:zones:brand:ipkg.p5m	Thu Oct 20 16:54:12 2011 -0700
@@ -26,8 +26,8 @@
 set name=pkg.description \
     value="A branded zone whose software is managed using the Image Packaging System"
 set name=com.oracle.service.bugid \
-    last-fmri=package/[email protected],5.11-0.151.0.1:20101104T233545Z \
-    value=7011650 value=7012085
+    last-fmri=system/zones/brand/[email protected],5.11-0.151.0.1.2:20110127T224018Z \
+    value=7098585 value=7101660 value=7102984
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Packaging
 set name=variant.arch value=$(ARCH)