--- a/src/modules/misc.py	Mon Sep 26 08:19:15 2011 +0100
+++ b/src/modules/misc.py	Mon Sep 26 12:36:10 2011 -0700
@@ -71,7 +71,7 @@
 
         # TBD: replace with a call to api.info() that can return a "release"
         # attribute of form YYYYMM against the SUNWsolnm package
-        return "http://download.oracle.com/docs/cd/E19963-01/"
+        return "http://www.oracle.com/pls/topic/lookup?ctx=E23824&id=SERNS"
 
 def time_to_timestamp(t):
         """convert seconds since epoch to %Y%m%dT%H%M%SZ format"""

--- a/src/pkg/manifests/group:system:solaris-desktop.p5m	Mon Sep 26 08:19:15 2011 +0100
+++ b/src/pkg/manifests/group:system:solaris-desktop.p5m	Mon Sep 26 12:36:10 2011 -0700
@@ -473,6 +473,8 @@
 depend type=group fmri=system/storage/sas-utilities
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
+depend type=group fmri=system/xopen/xcu4
+depend type=group fmri=system/xopen/xcu6
 depend type=group fmri=system/zones
 depend type=group fmri=system/zones/brand/brand-solaris
 depend type=group fmri=system/zones/brand/brand-solaris10

--- a/src/pkg/manifests/group:system:solaris-large-server.p5m	Mon Sep 26 08:19:15 2011 +0100
+++ b/src/pkg/manifests/group:system:solaris-large-server.p5m	Mon Sep 26 12:36:10 2011 -0700
@@ -359,6 +359,8 @@
 depend type=group fmri=system/storage/sas-utilities
 depend type=group fmri=system/system-events
 depend type=group fmri=system/virtual-console
+depend type=group fmri=system/xopen/xcu4
+depend type=group fmri=system/xopen/xcu6
 depend type=group fmri=system/zones
 depend type=group fmri=system/zones/brand/brand-solaris
 depend type=group fmri=system/zones/brand/brand-solaris10

--- a/src/pkg/manifests/group:system:solaris-small-server.p5m	Mon Sep 26 08:19:15 2011 +0100
+++ b/src/pkg/manifests/group:system:solaris-small-server.p5m	Mon Sep 26 12:36:10 2011 -0700
@@ -192,6 +192,7 @@
 depend type=group fmri=security/nss-utilities
 depend type=group fmri=security/sudo
 depend type=group fmri=security/tcp-wrapper
+depend type=group fmri=service/file-system/nfs
 depend type=group fmri=service/network/smtp/sendmail
 depend type=group fmri=service/network/ssh
 depend type=group fmri=service/network/wpa variant.opensolaris.zone=global

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/175.0.0.0.0.0/common/Hypervisor	Mon Sep 26 12:36:10 2011 -0700
@@ -0,0 +1,9 @@
+package system/xvm
+consolidation "xvm"
+obsoleted 160
+end package
+
+package xvm
+consolidation "xvm"
+obsoleted 160
+end package

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/175.0.0.0.0.0/redist_cluster	Mon Sep 26 12:36:10 2011 -0700
@@ -0,0 +1,365 @@
+include common/developer:java:jdk-6
+include common/library:java:java-demo-6
+include common/library:java:javadb
+include common/library:java:javahelp
+include common/runtime:java:jre-6
+# Include statements for obsoleted packages.
+$(i386_ONLY)include common/FSWfontconfig-devel-docs
+$(i386_ONLY)include common/FSWxorg-devel-docs
+$(i386_ONLY)include common/FSWxwpft
+$(i386_ONLY)include common/Hypervisor
+include common/Redistributable
+$(i386_ONLY)include common/SUNWadmc
+$(i386_ONLY)include common/SUNWaspell
+$(i386_ONLY)include common/SUNWaspell-en
+$(i386_ONLY)include common/SUNWbrg
+$(i386_ONLY)include common/SUNWccccfg
+$(i386_ONLY)include common/SUNWccccr
+$(i386_ONLY)include common/SUNWccfw
+$(i386_ONLY)include common/SUNWccfwctrl
+$(i386_ONLY)include common/SUNWccinv
+$(i386_ONLY)include common/SUNWccsign
+$(i386_ONLY)include common/SUNWcctpx
+$(i386_ONLY)include common/SUNWciu8
+$(i386_ONLY)include common/SUNWcsmauth
+$(i386_ONLY)include common/SUNWeuxwe
+$(i386_ONLY)include common/SUNWgnome-media-mp3
+$(i386_ONLY)include common/SUNWgnu-libiconv
+$(i386_ONLY)include common/SUNWhiu8
+$(i386_ONLY)include common/SUNWiniu8
+$(i386_ONLY)include common/SUNWkiu8
+$(i386_ONLY)include common/SUNWladm
+$(i386_ONLY)include common/SUNWlccom
+$(i386_ONLY)include common/SUNWlcl
+include common/SUNWpostgr
+include common/SUNWpostgr-contrib
+include common/SUNWpostgr-docs
+include common/SUNWpostgr-libs
+include common/SUNWpostgr-pl
+include common/SUNWpostgr-server
+$(i386_ONLY)include common/SUNWpostgr-server-data
+$(i386_ONLY)include common/SUNWppro
+$(i386_ONLY)include common/SUNWppro-plugin-sunos-base
+$(i386_ONLY)include common/SUNWsam
+$(i386_ONLY)include common/SUNWscn-base
+$(i386_ONLY)include common/SUNWscnprm
+$(i386_ONLY)include common/SUNWscnsom
+$(i386_ONLY)include common/SUNWsensor
+include common/SUNWsfdoc
+include common/SUNWsfinf
+include common/SUNWsfman
+include common/SUNWsfwhea
+$(i386_ONLY)include common/SUNWtiu8
+$(i386_ONLY)include common/SUNWulcf
+$(i386_ONLY)include common/SUNWupdatemgr
+include common/SUNWusbccid
+$(i386_ONLY)include common/SUNWuxlcf
+$(i386_ONLY)include common/SUNWxi18n
+$(i386_ONLY)include common/SUNWxsun-keytables
+$(i386_ONLY)include common/SUNWxwhl
+include common/benchmark:bonnieplus
+include common/benchmark:iozone
+include common/benchmark:sysbench
+include common/database:mysql-4
+include common/database:mysql-4:tests
+include common/database:mysql-50
+include common/database:mysql-50:connector:jdbc
+include common/database:mysql-50:tests
+include common/database:postgres-82
+include common/database:postgres-82:connector:jdbc
+include common/database:postgres-82:contrib
+include common/database:postgres-82:developer
+include common/database:postgres-82:documentation
+include common/database:postgres-82:language-bindings
+include common/database:postgres-82:library
+include common/database:postgres-82:pgtcl
+include common/database:postgres-83
+include common/database:postgres-83:connector:jdbc
+include common/database:postgres-83:contrib
+include common/database:postgres-83:developer
+include common/database:postgres-83:documentation
+include common/database:postgres-83:language-bindings
+include common/database:postgres-83:library
+include common/database:postgres-83:pgbouncer
+include common/database:postgres-83:pgtcl
+include common/database:postgres-84
+include common/database:postgres-84:contrib
+include common/database:postgres-84:developer
+include common/database:postgres-84:documentation
+include common/database:postgres-84:language-bindings
+include common/database:postgres-84:library
+include common/database:postgres-84:tests
+include common/database:postgres-common
+include common/database:postgres:library:c++:libpqxx
+include common/database:postgres:pg_upgrade
+include common/database:postgres:pgadmin
+include common/database:postgres:pgtcl
+include common/database:yaz
+include common/desktop:remote-desktop:turbovnc
+include common/developer:documentation-tool:epydoc
+include common/developer:imperius
+include common/developer:konkretcmpi
+include common/developer:parser:antlr-3
+include common/diagnostic:bwm-ng
+include common/driver:network:ce
+include common/editor:bvi
+include common/editor:jedit
+include common/image:virtualgl
+include common/library:apr-util-13:dbd-pgsql
+include common/library:desktop:gtk1
+include common/library:fftw-2
+include common/library:glib1
+include common/library:java:activation
+include common/library:java:asm
+include common/library:java:cglib
+include common/library:java:dom4j
+include common/library:java:drools
+include common/library:java:janino
+include common/library:java:jarjar
+include common/library:java:javamail
+include common/library:java:jaxb
+include common/library:java:jaxen-core
+include common/library:java:jdt-core
+include common/library:java:jettison
+include common/library:java:jexcelapi
+include common/library:java:joda-time
+include common/library:java:jrexx
+include common/library:java:log4j
+include common/library:java:mvel
+include common/library:java:pullparser
+include common/library:java:relaxngdatatype
+include common/library:java:saaj
+include common/library:java:stringtemplate
+include common/library:java:trove
+include common/library:java:wiseman
+include common/library:java:xom
+include common/library:java:xpp3-min
+include common/library:java:xsdlib
+include common/library:java:xstream
+include common/library:libosip2
+include common/library:perl-5:postgres-dbi
+include common/library:python-2:libxml2-24
+include common/library:python-2:libxsl-24
+include common/library:python-2:lxml-24
+include common/library:python-2:pyopenssl-24
+$(i386_ONLY)include common/loc/SUNWauaos
+$(i386_ONLY)include common/loc/SUNWauaow
+$(i386_ONLY)include common/loc/SUNWcadis
+$(i386_ONLY)include common/loc/SUNWcadma
+$(i386_ONLY)include common/loc/SUNWcamos
+$(i386_ONLY)include common/loc/SUNWcamow
+$(i386_ONLY)include common/loc/SUNWcbrg
+$(i386_ONLY)include common/loc/SUNWceuos
+$(i386_ONLY)include common/loc/SUNWceuow
+$(i386_ONLY)include common/loc/SUNWcladm
+$(i386_ONLY)include common/loc/SUNWcleue
+$(i386_ONLY)include common/loc/SUNWcpprou
+$(i386_ONLY)include common/loc/SUNWcupdatemgru
+$(i386_ONLY)include common/loc/SUNWcwsr2
+$(i386_ONLY)include common/loc/SUNWdbrg
+$(i386_ONLY)include common/loc/SUNWdedis
+$(i386_ONLY)include common/loc/SUNWdedma
+$(i386_ONLY)include common/loc/SUNWdeiso1
+$(i386_ONLY)include common/loc/SUNWdews2
+$(i386_ONLY)include common/loc/SUNWdladm
+$(i386_ONLY)include common/loc/SUNWdpprou
+$(i386_ONLY)include common/loc/SUNWdupdatemgru
+$(i386_ONLY)include common/loc/SUNWdxplt
+$(i386_ONLY)include common/loc/SUNWebrg
+$(i386_ONLY)include common/loc/SUNWeeuos
+$(i386_ONLY)include common/loc/SUNWeeuow
+$(i386_ONLY)include common/loc/SUNWeladm
+$(i386_ONLY)include common/loc/SUNWepprou
+$(i386_ONLY)include common/loc/SUNWesdis
+$(i386_ONLY)include common/loc/SUNWesdma
+$(i386_ONLY)include common/loc/SUNWesiso1
+$(i386_ONLY)include common/loc/SUNWesws2
+$(i386_ONLY)include common/loc/SUNWeu8os
+$(i386_ONLY)include common/loc/SUNWeuluf
+$(i386_ONLY)include common/loc/SUNWeupdatemgru
+$(i386_ONLY)include common/loc/SUNWexplt
+$(i386_ONLY)include common/loc/SUNWfbrg
+$(i386_ONLY)include common/loc/SUNWfladm
+$(i386_ONLY)include common/loc/SUNWfpprou
+$(i386_ONLY)include common/loc/SUNWfrdis
+$(i386_ONLY)include common/loc/SUNWfrdma
+$(i386_ONLY)include common/loc/SUNWfriso1
+$(i386_ONLY)include common/loc/SUNWfrws2
+$(i386_ONLY)include common/loc/SUNWfupdatemgru
+$(i386_ONLY)include common/loc/SUNWfxplt
+$(i386_ONLY)include common/loc/SUNWhadis
+$(i386_ONLY)include common/loc/SUNWhadma
+$(i386_ONLY)include common/loc/SUNWhbrg
+$(i386_ONLY)include common/loc/SUNWhkeue
+$(i386_ONLY)include common/loc/SUNWhladm
+$(i386_ONLY)include common/loc/SUNWhleue
+$(i386_ONLY)include common/loc/SUNWhpprou
+$(i386_ONLY)include common/loc/SUNWhupdatemgru
+$(i386_ONLY)include common/loc/SUNWhwsr2
+$(i386_ONLY)include common/loc/SUNWi13cs
+$(i386_ONLY)include common/loc/SUNWi15cs
+$(i386_ONLY)include common/loc/SUNWi1cs
+$(i386_ONLY)include common/loc/SUNWi2cs
+$(i386_ONLY)include common/loc/SUNWi5cs
+$(i386_ONLY)include common/loc/SUNWi7cs
+$(i386_ONLY)include common/loc/SUNWi9cs
+$(i386_ONLY)include common/loc/SUNWibrg
+$(i386_ONLY)include common/loc/SUNWiiimf-in-indicle
+$(i386_ONLY)include common/loc/SUNWiiimf-ko-kole
+$(i386_ONLY)include common/loc/SUNWiladm
+$(i386_ONLY)include common/loc/SUNWindt
+$(i386_ONLY)include common/loc/SUNWinleu
+$(i386_ONLY)include common/loc/SUNWinplt
+$(i386_ONLY)include common/loc/SUNWipprou
+$(i386_ONLY)include common/loc/SUNWitdis
+$(i386_ONLY)include common/loc/SUNWitdma
+$(i386_ONLY)include common/loc/SUNWitiso1
+$(i386_ONLY)include common/loc/SUNWitws2
+$(i386_ONLY)include common/loc/SUNWiupdatemgru
+$(i386_ONLY)include common/loc/SUNWixplt
+$(i386_ONLY)include common/loc/SUNWjadis
+$(i386_ONLY)include common/loc/SUNWjadma
+$(i386_ONLY)include common/loc/SUNWjbrg
+$(i386_ONLY)include common/loc/SUNWjladm
+$(i386_ONLY)include common/loc/SUNWjpprou
+$(i386_ONLY)include common/loc/SUNWjtsu
+$(i386_ONLY)include common/loc/SUNWjupdatemgru
+$(i386_ONLY)include common/loc/SUNWjws2
+$(i386_ONLY)include common/loc/SUNWjxplt
+$(i386_ONLY)include common/loc/SUNWkadis
+$(i386_ONLY)include common/loc/SUNWkadma
+$(i386_ONLY)include common/loc/SUNWkbrg
+$(i386_ONLY)include common/loc/SUNWkladm
+$(i386_ONLY)include common/loc/SUNWkleue
+$(i386_ONLY)include common/loc/SUNWkpprou
+$(i386_ONLY)include common/loc/SUNWktsu
+$(i386_ONLY)include common/loc/SUNWkupdatemgru
+$(i386_ONLY)include common/loc/SUNWkwsr2
+$(i386_ONLY)include common/loc/SUNWlocaledefsrc
+$(i386_ONLY)include common/loc/SUNWmeaos
+$(i386_ONLY)include common/loc/SUNWmeaow
+$(i386_ONLY)include common/loc/SUNWnafos
+$(i386_ONLY)include common/loc/SUNWnafow
+$(i386_ONLY)include common/loc/SUNWnamos
+$(i386_ONLY)include common/loc/SUNWnamow
+$(i386_ONLY)include common/loc/SUNWneuos
+$(i386_ONLY)include common/loc/SUNWneuow
+$(i386_ONLY)include common/loc/SUNWsamos
+$(i386_ONLY)include common/loc/SUNWsamow
+$(i386_ONLY)include common/loc/SUNWsbrg
+$(i386_ONLY)include common/loc/SUNWseuos
+$(i386_ONLY)include common/loc/SUNWseuow
+$(i386_ONLY)include common/loc/SUNWsladm
+$(i386_ONLY)include common/loc/SUNWspprou
+$(i386_ONLY)include common/loc/SUNWsupdatemgru
+$(i386_ONLY)include common/loc/SUNWsvdis
+$(i386_ONLY)include common/loc/SUNWsvdma
+$(i386_ONLY)include common/loc/SUNWsviso1
+$(i386_ONLY)include common/loc/SUNWsxplt
+$(i386_ONLY)include common/loc/SUNWweuos
+$(i386_ONLY)include common/loc/SUNWweuow
+include common/network:tor
+include common/runtime:dosbox
+include common/runtime:java:jruby
+include common/runtime:perl-510
+include common/runtime:perl-510:extra
+include common/runtime:tcl-8:snack
+include common/service:database:postgres-82
+include common/service:database:postgres-83
+include common/service:database:postgres-84
+include common/service:management:sysidtool
+include common/service:network:load-balancer:pen
+include common/service:network:sip:ser
+include common/service:network:sip:ser:administration
+include common/shell:pdsh
+include common/shell:shmux
+$(i386_ONLY)include common/slim_cd
+include common/system:library:sysidtool
+include common/system:management:powerman
+include common/system:management:product-registry
+include common/system:management:sysidtool
+include common/system:management:wbem:cimple
+include common/system:management:webmin
+include common/terminal:mrxvt
+include common/text:dwdiff
+include common/text:idzebra
+include common/web:aget
+include common/web:analytics:awstats
+include common/web:php-52:extension:php-pgsql
+include common/web:server:apache-13
+include common/web:server:apache-13:documentation
+$(i386_ONLY)include i386/SUNWxvmhvm
+$(i386_ONLY)include i386/system:library:libvirt
+$(i386_ONLY)include i386/system:storage:vdiskadm
+$(i386_ONLY)include i386/system:virtinst
+$(i386_ONLY)include i386/system:xvm:header-xvm
+$(i386_ONLY)include i386/system:xvm:xvmstore
+$(i386_ONLY)include i386/web:urlgrabber
+$(sparc_ONLY)include sparc/SUNWafb
+$(sparc_ONLY)include sparc/SUNWafbcf
+$(sparc_ONLY)include sparc/SUNWafbw
+$(sparc_ONLY)include sparc/SUNWffb
+$(sparc_ONLY)include sparc/SUNWffbcf
+$(sparc_ONLY)include sparc/SUNWffbw
+$(sparc_ONLY)include sparc/SUNWgfb
+$(sparc_ONLY)include sparc/SUNWgfbcf
+$(sparc_ONLY)include sparc/SUNWgfbw
+$(sparc_ONLY)include sparc/SUNWifb
+$(sparc_ONLY)include sparc/SUNWifbcf
+$(sparc_ONLY)include sparc/SUNWifbw
+$(sparc_ONLY)include sparc/SUNWjfb
+$(sparc_ONLY)include sparc/SUNWjfbcf
+$(sparc_ONLY)include sparc/SUNWjfbw
+$(sparc_ONLY)include sparc/SUNWm64
+$(sparc_ONLY)include sparc/SUNWm64cf
+$(sparc_ONLY)include sparc/SUNWm64w
+$(sparc_ONLY)include sparc/SUNWnfbcf
+$(sparc_ONLY)include sparc/SUNWpfbcf
+$(sparc_ONLY)include sparc/SUNWzulu
+$(sparc_ONLY)include sparc/SUNWzuluc
+$(sparc_ONLY)include sparc/SUNWzuluw
+$(sparc_ONLY)include sparc/TSIpgx
+$(sparc_ONLY)include sparc/TSIpgxw
+$(sparc_ONLY)include sparc/driver:graphics:kfb
+$(sparc_ONLY)include sparc/driver:network:ge
+$(sparc_ONLY)include sparc/system:graphics:fbconfig:fbconfig-kfb
+$(sparc_ONLY)include sparc/x11:server:xorg:driver:xorg-kfb
+# Include statements for renamed packages.
+$(i386_ONLY)include common/FSWxorg-client-docs
+$(i386_ONLY)include common/FSWxorg-client-programs
+$(i386_ONLY)include common/FSWxorg-clientlibs
+$(i386_ONLY)include common/FSWxorg-data
+$(i386_ONLY)include common/FSWxorg-headers
+$(i386_ONLY)include common/FSWxwrtl
+$(i386_ONLY)include common/SUNWapch2
+$(i386_ONLY)include common/SUNWapch22m-php5
+$(i386_ONLY)include common/SUNWapch2d
+$(i386_ONLY)include common/SUNWdistro-license
+include common/SUNWgimpprint
+$(i386_ONLY)include common/SUNWgnome-a11y-poke-root
+$(i386_ONLY)include common/SUNWgnome-xml-root
+$(i386_ONLY)include common/SUNWgnome-xml-share
+$(i386_ONLY)include common/SUNWgscr
+$(i386_ONLY)include common/SUNWiiim
+$(i386_ONLY)include common/SUNWjavadb-client
+$(i386_ONLY)include common/SUNWjavadb-common
+$(i386_ONLY)include common/SUNWjavadb-core
+$(i386_ONLY)include common/SUNWjavadb-demo
+$(i386_ONLY)include common/SUNWjavadb-docs
+$(i386_ONLY)include common/SUNWjavadb-javadoc
+include common/SUNWnet-snmp-utils
+$(i386_ONLY)include common/SUNWphp524
+$(i386_ONLY)include common/SUNWphp524-mysql
+$(i386_ONLY)include common/SUNWphp524core
+$(i386_ONLY)include common/SUNWphp524doc
+$(i386_ONLY)include common/SUNWphp524man
+$(i386_ONLY)include common/SUNWphp524usr
+include common/SUNWsfwdemo
+include common/SUNWsmagt
+include common/SUNWsmcmd
+include common/SUNWsmdoc
+include common/SUNWsmmgr
+$(sparc_ONLY)include sparc/SUNWnfb
+$(sparc_ONLY)include sparc/SUNWnfbw
+$(sparc_ONLY)include sparc/SUNWpfb
+$(sparc_ONLY)include sparc/SUNWpfbw

--- a/src/util/distro-import/Makefile	Mon Sep 26 08:19:15 2011 +0100
+++ b/src/util/distro-import/Makefile	Mon Sep 26 12:36:10 2011 -0700
@@ -28,7 +28,7 @@
 NATIVE_ARCH:sh = uname -p
 PROTO_AREA=../../../proto/root_$(NATIVE_ARCH)
 
-TRUNKID=174
+TRUNKID=175
 UPDATENUM=0
 SRUNUM=0
 PLATNUM=0
@@ -78,8 +78,8 @@
 
 DESKTOP_REPO=http://localhost:20007
 DESKTOP_BRANCHID=$(BRANCHID)
-DESKTOP_GNOME_L10N_INCORPORATION=consolidation/gnome_l10n/[email protected].$(DESKTOP_BRANCHID)
-DESKTOP_GNOME_INCORPORATION=consolidation/gnome/[email protected].$(DESKTOP_BRANCHID)
+DESKTOP_INCORPORATION=consolidation/desktop/[email protected].$(DESKTOP_BRANCHID)
+DESKTOP_GNOME_INCORPORATION=consolidation/desktop/[email protected].$(DESKTOP_BRANCHID)
 
 CDE_REPO=http://localhost:20008
 CDE_BRANCHID=$(BRANCHID)
@@ -201,21 +201,18 @@
 	-E $(L10N_INCORPORATION)
 
 DESKTOP_CONSOLIDATION_OPTIONS = \
-	-C gnome_l10n \
-	-R $(DESKTOP_REPO)@$(DESKTOP_GNOME_L10N_INCORPORATION) \
-	-E $(DESKTOP_GNOME_L10N_INCORPORATION) \
-	-C gnome \
+	-C desktop \
 	-R $(DESKTOP_REPO)@$(DESKTOP_GNOME_INCORPORATION) \
-	-E $(DESKTOP_GNOME_INCORPORATION)
+	-E $(DESKTOP_GNOME_INCORPORATION) \
+	-R $(DESKTOP_REPO)@$(DESKTOP_INCORPORATION) \
+	-E $(DESKTOP_INCORPORATION)
 
 CDE_CONSOLIDATION_OPTIONS = \
 	-C cde \
 	-R $(CDE_REPO)@$(CDE_INCORPORATION) \
 	-E $(CDE_INCORPORATION)
 
-FOSS_CONSOLIDATION_OPTIONS = \
-	-C foss \
-	-R $(FOSS_REPO)@"*"
+FOSS_CONSOLIDATION_OPTIONS =
 
 CACAO_CONSOLIDATION_OPTIONS = \
 	-C cacao \
@@ -336,6 +333,7 @@
 	$(JAVA_CONSOLIDATION_OPTIONS)
 CONSOLIDATION_OPTIONS_173 = $(CONSOLIDATION_OPTIONS_172)
 CONSOLIDATION_OPTIONS_174.0.0.0.0.0 = $(CONSOLIDATION_OPTIONS_172)
+CONSOLIDATION_OPTIONS_175.0.0.0.0.0 = $(CONSOLIDATION_OPTIONS_172)
 CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BRANCHID))
 
 GLOBAL_CHATTRS_BASE=	\
@@ -427,6 +425,7 @@
 GLOBAL_CHATTRS_172 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_173 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS_174.0.0.0.0.0 = $(GLOBAL_CHATTRS_124)
+GLOBAL_CHATTRS_175.0.0.0.0.0 = $(GLOBAL_CHATTRS_124)
 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BRANCHID))
 
 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.6/vendor-packages \
@@ -537,6 +536,7 @@
 ELIDED_FILES_172 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_173 = $(ELIDED_FILES_BASE)
 ELIDED_FILES_174.0.0.0.0.0 = $(ELIDED_FILES_BASE)
+ELIDED_FILES_175.0.0.0.0.0 = $(ELIDED_FILES_BASE)
 ELIDED_FILES = $(ELIDED_FILES_$(BRANCHID))
 
 #
@@ -667,6 +667,7 @@
 CACHED_FILES_172 =
 CACHED_FILES_173 =
 CACHED_FILES_174.0.0.0.0.0 =
+CACHED_FILES_175.0.0.0.0.0 =
 CACHED_FILES = $(CACHED_FILES_$(BRANCHID))
 
 FIX_FILES_BASE =				\
@@ -824,6 +825,7 @@
 FIX_FILES_172 =
 FIX_FILES_173 =
 FIX_FILES_174.0.0.0.0.0 =
+FIX_FILES_175.0.0.0.0.0 =
 FIX_FILES = $(FIX_FILES_$(BRANCHID))
 
 JDKFILES = LICENSE README.html
@@ -946,7 +948,8 @@
 	171			\
 	172			\
 	173			\
-	174.0.0.0.0.0
+	174.0.0.0.0.0		\
+	175.0.0.0.0.0
 
 #
 # Starting in build 80, filelist.ramdisk began moving between various
@@ -1203,6 +1206,7 @@
 INCLUDE_PATH_172 = 172:$(INCLUDE_PATH_171)
 INCLUDE_PATH_173 = 173:$(INCLUDE_PATH_172)
 INCLUDE_PATH_174.0.0.0.0.0 = 174.0.0.0.0.0:$(INCLUDE_PATH_173)
+INCLUDE_PATH_175.0.0.0.0.0 = 175.0.0.0.0.0:$(INCLUDE_PATH_174.0.0.0.0.0)
 
 import:	cluster.import $(FIX_FILES:%=$(BRANCHID)/%)
 	$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \

--- a/src/util/publish/Makefile	Mon Sep 26 08:19:15 2011 +0100
+++ b/src/util/publish/Makefile	Mon Sep 26 12:36:10 2011 -0700
@@ -44,7 +44,6 @@
 L10N_REPO=http://localhost:20006
 DESKTOP_REPO=http://localhost:20007
 CDE_REPO=http://localhost:20008
-FOSS_REPO=http://localhost:20009
 CACAO_REPO=http://localhost:20010
 CNS_REPO=http://localhost:20011
 JDMK_REPO=http://localhost:20012
@@ -67,7 +66,6 @@
     $(L10N_REPO) \
     $(DESKTOP_REPO) \
     $(CDE_REPO) \
-    $(FOSS_REPO) \
     $(CACAO_REPO) \
     $(CNS_REPO) \
     $(JDMK_REPO) \