--- a/src/pkg/manifests/package%2Fpkg%2Fpackage-manager.p5m	Thu Oct 07 16:00:39 2010 -0700
+++ b/src/pkg/manifests/package%2Fpkg%2Fpackage-manager.p5m	Fri Oct 08 22:40:00 2010 -0700
@@ -329,7 +329,6 @@
 file path=usr/share/package-manager/icons/hicolor/48x48/actions/pm-update_all.png
 file path=usr/share/package-manager/packagemanager.ui
 license cr_Oracle license=cr_Oracle
-license lic_CDDL license=lic_CDDL
 legacy pkg=SUNWipkg-gui version=0.1.1
 
 depend type=require fmri=desktop/gksu

--- a/src/pkg/manifests/package%2Fpkg%2Fupdate-manager.p5m	Thu Oct 07 16:00:39 2010 -0700
+++ b/src/pkg/manifests/package%2Fpkg%2Fupdate-manager.p5m	Fri Oct 08 22:40:00 2010 -0700
@@ -103,7 +103,6 @@
 dir path=var/svc/manifest/application
 file path=var/svc/manifest/application/pkg-update.xml
 license cr_Oracle license=cr_Oracle
-license lic_CDDL license=lic_CDDL
 legacy pkg=SUNWipkg-um version=0.1.1
 
 depend type=require fmri=SUNWcs@$(PKGVERS_COMPONENT)

--- a/src/pkg/manifests/package%2Fpkg.p5m	Thu Oct 07 16:00:39 2010 -0700
+++ b/src/pkg/manifests/package%2Fpkg.p5m	Fri Oct 08 22:40:00 2010 -0700
@@ -263,7 +263,6 @@
 file path=var/svc/manifest/application/pkg-server.xml
 file path=var/svc/manifest/application/pkg-mdns.xml
 license cr_Oracle license=cr_Oracle
-license lic_CDDL license=lic_CDDL
 license lic_minisat license=lic_minisat
 license lic_gustaebel license=lic_gustaebel
 legacy pkg=SUNWipkg version=0.0.0

--- a/src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m	Thu Oct 07 16:00:39 2010 -0700
+++ b/src/pkg/manifests/system%2Fzones%2Fbrand%2Fipkg.p5m	Fri Oct 08 22:40:00 2010 -0700
@@ -53,7 +53,6 @@
 file path=usr/lib/brand/ipkg/support mode=0755
 file path=usr/lib/brand/ipkg/uninstall mode=0755
 license cr_Oracle license=cr_Oracle
-license lic_CDDL license=lic_CDDL
 legacy pkg=SUNWipkg-brand version=0.0.0
 depend type=require fmri=SUNWcs@$(PKGVERS_COMPONENT)-$(CURBUILD_BRANCH)
 depend type=require fmri=package/pkg

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/150/common/SUNWgnome-themes	Fri Oct 08 22:40:00 2010 -0700
@@ -0,0 +1,19 @@
+package SUNWgnome-themes
+consolidation "gnome"
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+depend [email protected]
+renamed 150
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/150/common/compress:bzip2	Fri Oct 08 22:40:00 2010 -0700
@@ -0,0 +1,13 @@
+package compress/bzip2
+consolidation "sfw"
+classification "Applications/System Utilities"
+import SUNWbzip
+version 1.0.6
+end package
+
+package SUNWbzip
+consolidation "sfw"
+renamed 133
+depend compress/bzip2
+version 1.0.5
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/150/common/service:database:postgres-82	Fri Oct 08 22:40:00 2010 -0700
@@ -0,0 +1,17 @@
+package service/database/postgres-82
+consolidation "sfw"
+obsoleted 146
+version 8.2.17
+end package
+
+package SUNWpostgr-82-server
+consolidation "sfw"
+obsoleted 146
+version 8.2.15
+end package
+
+package SUNWpostgr-82-server-data-root
+consolidation "sfw"
+obsoleted 150
+version 8.2.6
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/150/common/web:php-52:extension:php-pgsql	Fri Oct 08 22:40:00 2010 -0700
@@ -0,0 +1,17 @@
+package web/php-52/extension/php-pgsql
+consolidation "sfw"
+obsoleted 146
+version 5.2.12
+end package
+
+package SUNWphp52-pgsql
+consolidation "sfw"
+obsoleted 146
+version 5.2.12
+end package
+
+package SUNWphp524-pgsql
+consolidation "sfw"
+obsoleted 150
+version 5.2.4
+end package

--- a/src/util/distro-import/150/redist_cluster	Thu Oct 07 16:00:39 2010 -0700
+++ b/src/util/distro-import/150/redist_cluster	Fri Oct 08 22:40:00 2010 -0700
@@ -1422,12 +1422,10 @@
 include common/SUNWnet-snmp-utils
 $(i386_ONLY)include common/SUNWphp524
 $(i386_ONLY)include common/SUNWphp524-mysql
-$(i386_ONLY)include common/SUNWphp524-pgsql
 $(i386_ONLY)include common/SUNWphp524core
 $(i386_ONLY)include common/SUNWphp524doc
 $(i386_ONLY)include common/SUNWphp524man
 $(i386_ONLY)include common/SUNWphp524usr
-$(i386_ONLY)include common/SUNWpostgr-82-server-data-root
 $(i386_ONLY)include common/SUNWproduct-registry-root
 include common/SUNWsfwdemo
 include common/SUNWsmagt

--- a/src/util/distro-import/Makefile	Thu Oct 07 16:00:39 2010 -0700
+++ b/src/util/distro-import/Makefile	Fri Oct 08 22:40:00 2010 -0700
@@ -629,7 +629,7 @@
 FILELIST_RAMDISK_PKG_72		= SUNWcakr.i
 FILELIST_RAMDISK_PKG_71		= SUNWcakr.i
 
-default:	149/redist_import
+default:	150/redist_import
 
 cluster.import:	$(WOS_PKGS)/.clustertoc Makefile
 	./clustertoc2import.py $(WOS_PKGS)/.clustertoc | \

--- a/src/util/publish/set-publisher.transforms	Thu Oct 07 16:00:39 2010 -0700
+++ b/src/util/publish/set-publisher.transforms	Fri Oct 08 22:40:00 2010 -0700
@@ -1,8 +1,1 @@
-<transform set name=pkg.fmri -> edit value pkg://[^/]+/ pkg://opensolaris.org/>
-
-# These are needed until 14870 is fixed.
-<transform file depend -> delete pkg.debug.depend.file .*>
-<transform file depend -> delete pkg.debug.depend.reason .*>
-<transform file depend -> delete pkg.debug.depend.type .*>
-<transform file depend -> delete pkg.debug.depend.path .*>
-<transform file depend -> delete pkg.debug.depend.severity .*>
+<transform set name=pkg.fmri -> edit value pkg://[^/]+/ pkg://solaris/>