--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Fri Sep 17 14:50:20 2010 +0100
@@ -0,0 +1,5 @@
+^\.hg
+^\.mq
+syntax: glob
+status
+guards

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/oi-releng-distro-import	Fri Sep 17 14:50:20 2010 +0100
@@ -0,0 +1,1074 @@
+diff --git a/src/util/distro-import/147/common/gnome:theme:background:openindiana-backgrounds b/src/util/distro-import/147/common/gnome:theme:background:openindiana-backgrounds
+new file mode 100644
+--- /dev/null
++++ b/src/util/distro-import/147/common/gnome:theme:background:openindiana-backgrounds
+@@ -0,0 +1,11 @@
++package gnome/theme/background/openindiana-backgrounds
++consolidation "gnome"
++classification "Desktop (GNOME)/Theming"
++import OIopenindiana-backgrounds
++end package
++
++package gnome/theme/background/opensolaris-backgrounds
++consolidation "gnome"
++renamed 137
++depend gnome/theme/background/openindiana-backgrounds
++end package
+diff --git a/src/util/distro-import/147/common/release:openindiana-welcome b/src/util/distro-import/147/common/release:openindiana-welcome
+new file mode 100644
+--- /dev/null
++++ b/src/util/distro-import/147/common/release:openindiana-welcome
+@@ -0,0 +1,11 @@
++package release/openindiana-welcome
++consolidation "gnome"
++classification "System/Text Tools"
++import OIopenindiana-welcome
++end package
++
++package release/opensolaris-welcome
++consolidation "gnome"
++renamed 137
++depend release/openindiana-welcome
++end package
+diff --git a/src/util/distro-import/147/common/system:display-manager:openindiana-gdm-themes b/src/util/distro-import/147/common/system:display-manager:openindiana-gdm-themes
+new file mode 100644
+--- /dev/null
++++ b/src/util/distro-import/147/common/system:display-manager:openindiana-gdm-themes
+@@ -0,0 +1,11 @@
++package system/display-manager/openindiana-gdm-themes
++consolidation "gnome"
++classification "Desktop (GNOME)/Theming"
++import OIopenindiana-gdm-themes
++end package
++
++package system/display-manager/opensolaris-gdm-themes
++consolidation "gnome"
++renamed 137
++depend system/display-manager/openindiana-gdm-themes
++end package
+diff --git a/src/util/distro-import/147/ossnap_cluster b/src/util/distro-import/147/ossnap_cluster
+new file mode 100644
+--- /dev/null
++++ b/src/util/distro-import/147/ossnap_cluster
+@@ -0,0 +1,872 @@
++include common/Amp
++include common/archiver:gnu-tar
++include common/archiver:unrar
++include common/audio:sox
++include common/backup:areca
++include common/backup:rdiff-backup
++include common/benchmark:bonnieplus
++include common/benchmark:gtkperf
++include common/benchmark:iozone
++include common/benchmark:iperf
++include common/benchmark:sysbench
++include common/codec:flac
++include common/codec:install:codeina
++include common/codec:libtheora
++include common/codec:ogg-vorbis
++include common/codec:speex
++include common/communication:conferencing:ekiga
++include common/communication:im:pidgin
++include common/communication:pda:gnome-pilot
++include common/communication:pda:pilot-link
++include common/compress:bzip2
++include common/compress:gzip
++include common/compress:p7zip
++include common/compress:unzip
++include common/compress:zip
++include common/crypto:gnupg
++include common/crypto:pwgen
++include common/data:docbook
++include common/data:iso-codes
++include common/database:mysql-4
++include common/database:mysql-4:tests
++include common/database:mysql-5
++include common/database:mysql-5:connector:jdbc
++include common/database:mysql-5:tests
++include common/database:mysql-50
++include common/database:mysql-50:connector:jdbc
++include common/database:mysql-50:tests
++include common/database:mysql-51
++include common/database:mysql-51:library
++include common/database:mysql-51:tests
++include common/database:mysql-common
++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:sqlite-3
++include common/database:sqlite-3:documentation
++include common/database:yaz
++include common/desktop:administration:gnome-system-tools
++include common/desktop:administration:nwam-manager
++include common/desktop:archive-manager:file-roller
++include common/desktop:calculator:gcalctool
++include common/desktop:cd-burning:brasero
++include common/desktop:cd-ripping:sound-juicer
++include common/desktop:character-map:gucharmap
++include common/desktop:compiz
++include common/desktop:file-manager:gnome-commander
++include common/desktop:gftp
++include common/desktop:gksu
++include common/desktop:irc:xchat
++include common/desktop:media-player:moovida
++include common/desktop:media-player:songbird
++include common/desktop:network:gnome-nettool
++include common/desktop:pdf-viewer:evince
++include common/desktop:project-management:openproj
++include common/desktop:project-management:planner
++include common/desktop:remote-desktop:rdesktop
++include common/desktop:remote-desktop:tsclient
++include common/desktop:remote-desktop:vinagre
++include common/desktop:studio:jokosher
++include common/desktop:system-monitor:gkrellm
++include common/desktop:system-monitor:gnome-system-monitor
++include common/desktop:time-slider
++include common/desktop:time-tracking:hamster
++include common/desktop:torrent:transmission
++include common/desktop:xdg:menu-editor:alacarte
++include common/desktop:xdg:xdg-user-dirs-gtk
++include common/desktop:xdg:xdg-utils
++include common/desktop:xscreensaver
++include common/desktop:xscreensaver:hacks
++include common/desktop:xscreensaver:hacks:hacks-gl
++include common/desktop:xscreensaver:hacks:rss-glx
++include common/developer:bcc
++include common/developer:build:ant
++include common/developer:build:autoconf
++include common/developer:build:autogen
++include common/developer:build:automake-110
++include common/developer:build:automake-19
++include common/developer:build:cmake
++include common/developer:build:gnu-make
++include common/developer:build:libtool
++include common/developer:debug:gdb
++include common/developer:documentation-tool:doxygen
++include common/developer:documentation-tool:epydoc
++include common/developer:documentation-tool:gtk-doc
++include common/developer:documentation-tool:openjade
++include common/developer:documentation-tool:opensp
++include common/developer:fakeroot
++include common/developer:gcc-3
++include common/developer:gnome:devhelp
++include common/developer:gnome:gettext
++include common/developer:gnome:gnome-doc-utils
++include common/developer:gnu-binutils
++include common/developer:gperf
++include common/developer:imperius
++include common/developer:java:junit
++include common/developer:konkretcmpi
++include common/developer:lexer:flex
++include common/developer:macro:gnu-m4
++include common/developer:meld
++include common/developer:parser:antlr-2
++include common/developer:parser:antlr-3
++include common/developer:parser:bison
++include common/developer:python:pylint
++include common/developer:quilt
++include common/developer:swig
++include common/developer:ui-designer:glade
++include common/developer:vala
++include common/developer:versioning:cvs
++include common/developer:versioning:git
++include common/developer:versioning:mercurial
++include common/developer:versioning:subversion
++include common/diagnostic:bwm-ng
++include common/diagnostic:fping
++include common/diagnostic:httping
++include common/diagnostic:iftop
++include common/diagnostic:mrtg
++include common/diagnostic:nmap
++include common/diagnostic:snort
++include common/diagnostic:tcpdump
++include common/diagnostic:top
++include common/diagnostic:wireshark
++include common/documentation:diveintopython
++include common/documentation:gnome:gnome-devel-docs
++include common/documentation:gnome:gnome-user-docs
++include common/editor:bvi
++include common/editor:diagram:dia
++include common/editor:gedit
++include common/editor:gedit:gedit-plugins
++include common/editor:ghex
++include common/editor:gnu-emacs
++include common/editor:gnu-emacs:gnu-emacs-gtk
++include common/editor:gnu-emacs:gnu-emacs-lisp
++include common/editor:gnu-emacs:gnu-emacs-no-x11
++include common/editor:gnu-emacs:gnu-emacs-x11
++include common/editor:gobby
++include common/editor:gvim
++include common/editor:hexedit
++include common/editor:jedit
++include common/editor:nano
++include common/editor:vim
++include common/file:gnu-coreutils
++include common/file:gnu-findutils
++include common/file:mc
++include common/file:slocate
++include common/file:tree
++include common/games:gnome-games
++include common/games:nethack
++include common/GccDev
++include common/gnome:accessibility:accerciser
++include common/gnome:accessibility:dasher
++include common/gnome:accessibility:gnome-a11y-libs
++include common/gnome:accessibility:gok
++include common/gnome:accessibility:mousetweaks
++include common/gnome:accessibility:orca
++include common/gnome:applet:contact-lookup-applet
++include common/gnome:applet:gnome-applets
++include common/gnome:applet:gnome-fun-applets
++include common/gnome:applet:gnome-internet-applets
++include common/gnome:applet:gnome-intranet-applets
++include common/gnome:applet:gnome-mm-applets
++include common/gnome:applet:gnome-utility-applets
++include common/gnome:config:gconf
++include common/gnome:config:gconf:gconf-editor
++include common/gnome:crash-report:bug-buddy
++include common/gnome:desklet:gdesklets
++include common/gnome:desklet:gdesklets-extra
++include common/gnome:disk-analyzer:baobab
++include common/gnome:documentation:locale:cs
++include common/gnome:documentation:locale:de
++include common/gnome:documentation:locale:es
++include common/gnome:documentation:locale:extra
++include common/gnome:documentation:locale:fr
++include common/gnome:documentation:locale:hi
++include common/gnome:documentation:locale:hu
++include common/gnome:documentation:locale:it
++include common/gnome:documentation:locale:ja
++include common/gnome:documentation:locale:ko
++include common/gnome:documentation:locale:noinst
++include common/gnome:documentation:locale:pl
++include common/gnome:documentation:locale:pt_br
++include common/gnome:documentation:locale:rtl
++include common/gnome:documentation:locale:sv
++include common/gnome:documentation:locale:zh_cn
++include common/gnome:documentation:locale:zh_hk
++include common/gnome:documentation:locale:zh_tw
++include common/gnome:file-manager:nautilus
++include common/gnome:file-manager:nautilus:extension:nautilus-sendto
++include common/gnome:ggv
++include common/gnome:gnome-audio
++include common/gnome:gnome-camera
++include common/gnome:gnome-dictionary
++include common/gnome:gnome-keyring
++include common/gnome:gnome-log-viewer
++include common/gnome:gnome-panel
++include common/gnome:gnome-power-manager
++include common/gnome:gnome-remote-desktop
++include common/gnome:gnome-screenshot
++include common/gnome:gnome-search-tool
++include common/gnome:gnome-session
++include common/gnome:help-viewer:yelp
++include common/gnome:locale:cs
++include common/gnome:locale:de
++include common/gnome:locale:es
++include common/gnome:locale:extra
++include common/gnome:locale:fr
++include common/gnome:locale:hg
++include common/gnome:locale:hi
++include common/gnome:locale:it
++include common/gnome:locale:ja
++include common/gnome:locale:ko
++include common/gnome:locale:noinst
++include common/gnome:locale:pl
++include common/gnome:locale:pt_br
++include common/gnome:locale:rtl
++include common/gnome:locale:ru
++include common/gnome:locale:sv
++include common/gnome:locale:zh_cn
++include common/gnome:locale:zh_hk
++include common/gnome:locale:zh_tw
++include common/gnome:media:gnome-media
++include common/gnome:media:gnome-media-player
++include common/gnome:media:sound-recorder
++include common/gnome:preferences:control-center
++include common/gnome:security:seahorse
++include common/gnome:security:seahorse:seahorse-plugins
++include common/gnome:speech:gnome-speech
++include common/gnome:speech:gnome-speech:driver:gnome-speech-espeak
++include common/gnome:theme:background:openindiana-backgrounds
++#include common/gnome:theme:background:opensolaris-backgrounds-extra
++include common/gnome:theme:blueprint
++include common/gnome:theme:cursor:dmz-cursor
++include common/gnome:theme:cursor:dmz-cursor-aa
++include common/gnome:theme:cursor:neutral_plus_inv
++include common/gnome:theme:gnome-icon-theme
++include common/gnome:theme:gnome-themes
++include common/gnome:theme:gnome-themes-extra
++include common/gnome:theme:gtk2-engines
++include common/gnome:theme:gtk2-engines-extra
++include common/gnome:theme:hicolor-icon-theme
++include common/gnome:theme:nimbus
++include common/gnome:theme:nimbus-hires
++include common/gnome:theme:sound:xdg-sound-theme
++include common/gnome:theme:tango-icon-theme
++include common/gnome:trusted:device-manager
++include common/gnome:trusted:libgnometsol
++include common/gnome:trusted:locale:de
++include common/gnome:trusted:locale:es
++include common/gnome:trusted:locale:fr
++include common/gnome:trusted:locale:it
++include common/gnome:trusted:locale:ja
++include common/gnome:trusted:locale:ko
++include common/gnome:trusted:locale:pt_br
++include common/gnome:trusted:locale:ru
++include common/gnome:trusted:locale:sv
++include common/gnome:trusted:locale:zh_cn
++include common/gnome:trusted:locale:zh_hk
++include common/gnome:trusted:locale:zh_tw
++include common/gnome:trusted:login-label-selector
++include common/gnome:trusted:selection-manager
++include common/gnome:trusted:trusted-stripe
++include common/gnome:trusted:xagent
++include common/gnome:window-manager:metacity
++include common/gnome:zenity
++include common/Hypervisor
++include common/image:dcraw
++include common/image:editor:gimp
++include common/image:editor:gimp:gimp-help
++include common/image:editor:gimp:locale:cs
++include common/image:editor:gimp:locale:de
++include common/image:editor:gimp:locale:es
++include common/image:editor:gimp:locale:extra
++include common/image:editor:gimp:locale:fr
++include common/image:editor:gimp:locale:it
++include common/image:editor:gimp:locale:ko
++include common/image:editor:gimp:locale:pl
++include common/image:editor:gimp:locale:ru
++include common/image:editor:gimp:locale:sv
++include common/image:editor:gimp:locale:zh_cn
++include common/image:editor:gimp:plugin:gimp-gtkam
++include common/image:gnome-backgrounds
++include common/image:gnuplot
++include common/image:gocr
++include common/image:imagemagick
++include common/image:library:babl
++include common/image:library:gegl
++include common/image:library:libart
++include common/image:library:libexif
++include common/image:library:libjpeg
++include common/image:library:libpng
++include common/image:library:librsvg
++include common/image:library:libtiff
++include common/image:rrdtool
++include common/image:scanner:xsane
++include common/image:scanner:xsane:sane-backends
++include common/image:scanner:xsane:sane-frontend
++include common/image:viewer:eog
++include common/image:viewer:eog:eog-plugins
++include common/image:viewer:gqview
++include common/image:viewer:gthumb
++include common/image:webcam:cheese
++include common/library:aalib
++include common/library:accessibility:brltty
++include common/library:apr-13
++include common/library:apr-13:documentation
++include common/library:apr-util-13
++include common/library:apr-util-13:apr-ldap
++include common/library:apr-util-13:dbd-mysql
++include common/library:apr-util-13:dbd-pgsql
++include common/library:apr-util-13:dbd-sqlite
++include common/library:apr-util-13:documentation
++include common/library:audio:gstreamer
++include common/library:audio:gstreamer:plugin:gnonlin
++include common/library:audio:libmikmod
++include common/library:c++:glibmm
++include common/library:c++:libxml++
++include common/library:c++:net6
++include common/library:c++:obby
++include common/library:c++:sigcpp
++include common/library:c++:stdcxx
++include common/library:database:gdbm
++include common/library:desktop:atk
++include common/library:desktop:c++:cairomm
++include common/library:desktop:c++:gtkmm
++include common/library:desktop:c++:pangomm
++include common/library:desktop:cairo
++include common/library:desktop:clutter
++include common/library:desktop:clutter:clutter-gst
++include common/library:desktop:clutter:clutter-gtk
++include common/library:desktop:evolution-data-server
++include common/library:desktop:gobject:gir-repository
++include common/library:desktop:gobject:gobject-introspection
++include common/library:desktop:goffice
++include common/library:desktop:gtk-vnc
++include common/library:desktop:gtk1
++include common/library:desktop:gtk2
++include common/library:desktop:gtk2:gtk-backend-cups
++include common/library:desktop:gtk2:gtk-backend-papi
++include common/library:desktop:gtkhtml
++include common/library:desktop:gtksourceview
++include common/library:desktop:gtkspell
++include common/library:desktop:libchamplain
++include common/library:desktop:libgdata
++include common/library:desktop:libgee
++include common/library:desktop:libglade
++include common/library:desktop:libgnomecanvas
++include common/library:desktop:libgsf
++include common/library:desktop:libgweather
++include common/library:desktop:libsexy
++include common/library:desktop:libvisual
++include common/library:desktop:pango
++include common/library:desktop:pigment
++include common/library:desktop:search:tracker
++include common/library:desktop:search:tracker:tracker-firefox
++include common/library:desktop:xdg:icon-naming-utils
++include common/library:desktop:xdg:libcanberra
++include common/library:expat
++include common/library:fastcgi
++include common/library:fastcgi:documentation
++include common/library:fftw-2
++include common/library:fftw-3
++include common/library:file-monitor:gamin
++include common/library:gc
++include common/library:gd
++include common/library:glib1
++include common/library:glib2
++include common/library:gmime
++include common/library:gmp
++include common/library:gnome:base-libs
++include common/library:gnome:gnome-component
++include common/library:gnome:gnome-keyring
++include common/library:gnome:gnome-libs
++include common/library:gnome:gnome-vfs
++include common/library:gnome:gvfs
++include common/library:gnome:print:gnome-print
++include common/library:gnome:print:gnome-print:gnome-print-papi
++include common/library:gnutls
++include common/library:graphics:libmng
++include common/library:graphics:wxwidgets
++include common/library:guile
++include common/library:id3lib
++include common/library:ilmbase
++include common/library:java:activation
++include common/library:java:asm
++include common/library:java:cglib
++include common/library:java:commons-collections
++include common/library:java:dom4j
++include common/library:java:drools
++include common/library:java:grails
++include common/library:java:janino
++include common/library:java:jarjar
++include common/library:java:java-gnome
++include common/library:java:java-gnome:java-libgconf
++include common/library:java:java-gnome:java-libvte
++include common/library:java:javamail
++include common/library:java:jaxb
++include common/library:java:jaxen-core
++include common/library:java:jdom
++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:memcached-java
++include common/library:java:mvel
++include common/library:java:pullparser
++include common/library:java:qdox
++include common/library:java:relaxngdatatype
++#include common/library:java:relaxngDatatype
++include common/library:java:saaj
++include common/library:java:stringtemplate
++include common/library:java:subversion
++include common/library:java:swt
++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:lcms
++include common/library:libconfuse
++include common/library:libcroco
++include common/library:libdaemon
++include common/library:libevent
++include common/library:libffi
++include common/library:libgtop
++include common/library:libical
++include common/library:libidn
++include common/library:libmemcached
++include common/library:libnotify
++include common/library:liboil
++include common/library:libosip2
++include common/library:libproxy
++include common/library:libproxy:libproxy-gnome
++include common/library:libproxy:libproxy-mozjs
++include common/library:librsync
++include common/library:libsigsegv
++include common/library:libsndfile
++include common/library:libsoup
++include common/library:libtasn1
++include common/library:libtool:libltdl
++include common/library:libtorrent
++include common/library:libunique
++include common/library:libxml2
++include common/library:libxslt
++include common/library:media-player:totem-pl-parser
++include common/library:mpfr
++include common/library:musicbrainz:libdiscid
++include common/library:musicbrainz:libmusicbrainz
++include common/library:myspell:dictionary:cs
++include common/library:myspell:dictionary:de
++include common/library:myspell:dictionary:en
++include common/library:myspell:dictionary:es
++include common/library:myspell:dictionary:extra
++include common/library:myspell:dictionary:fr
++include common/library:myspell:dictionary:hu
++include common/library:myspell:dictionary:it
++include common/library:myspell:dictionary:noinst
++include common/library:myspell:dictionary:pl
++include common/library:myspell:dictionary:pt_br
++include common/library:myspell:dictionary:ru
++include common/library:myspell:dictionary:sv
++include common/library:ncurses
++include common/library:neon
++include common/library:openexr
++include common/library:openldap
++include common/library:pcre
++include common/library:perl-5:authen-pam
++include common/library:perl-5:database
++include common/library:perl-5:net-ssleay
++include common/library:perl-5:pmtools
++include common/library:perl-5:postgres-dbi
++include common/library:perl-5:subversion
++include common/library:perl-5:xml-parser
++include common/library:popt
++include common/library:print:cups-libs
++include common/library:pth
++include common/library:python-2:coherence-26
++include common/library:python-2:cssutils-24
++include common/library:python-2:cssutils-26
++include common/library:python-2:ctypes-24
++include common/library:python-2:ipython-26
++include common/library:python-2:libxml2-24
++include common/library:python-2:libxml2-26
++include common/library:python-2:libxsl-24
++include common/library:python-2:libxsl-26
++include common/library:python-2:logilab-astng
++include common/library:python-2:logilab-common
++include common/library:python-2:pyatspi-26
++include common/library:python-2:pycups
++include common/library:python-2:pyopenssl-24
++include common/library:python-2:pyopenssl-26
++include common/library:python-2:pysqlite-24
++include common/library:python-2:python-dbus-24
++include common/library:python-2:python-dbus-26
++include common/library:python-2:python-extra-24
++include common/library:python-2:python-extra-26
++include common/library:python-2:python-gnome-desktop-24
++include common/library:python-2:python-gnome-desktop-26
++include common/library:python-2:python-gnome-extras-24
++include common/library:python-2:python-gnome-extras-26
++include common/library:python-2:python-gnome-libs-24
++include common/library:python-2:python-gnome-libs-26
++include common/library:python-2:python-gst-24
++include common/library:python-2:python-gst-26
++include common/library:python-2:python-gtk-vnc-24
++include common/library:python-2:python-gtk-vnc-26
++include common/library:python-2:python-imaging-24
++include common/library:python-2:python-imaging-26
++include common/library:python-2:python-mysql-24
++include common/library:python-2:python-mysql-26
++include common/library:python-2:python-notify-24
++include common/library:python-2:python-notify-26
++include common/library:python-2:python-pigment-26
++include common/library:python-2:python-twisted-24
++include common/library:python-2:python-twisted-26
++include common/library:python-2:python-twisted-web2-24
++include common/library:python-2:python-twisted-web2-26
++include common/library:python-2:python-xdg-24
++include common/library:python-2:python-xdg-26
++include common/library:python-2:python-zope-interface-24
++include common/library:python-2:python-zope-interface-26
++include common/library:python-2:pywbem
++include common/library:python-2:pyyaml-24
++include common/library:python-2:pyyaml-26
++include common/library:python-2:setuptools-24
++include common/library:python-2:setuptools-26
++include common/library:python-2:simplejson-24
++include common/library:python-2:simplejson-26
++#include common/library:python-2:simplejson-devel-26
++include common/library:python-2:subversion
++include common/library:raptor
++include common/library:readline
++include common/library:samba:libsmbclient
++include common/library:sdl
++include common/library:security:libgpg-error
++include common/library:security:openssl
++include common/library:security:openssl:openssl-fips-140
++include common/library:security:pam:module:pam-consolekit
++include common/library:security:pam:module:pam-pkcs11
++include common/library:security:trousers
++include common/library:slang
++include common/library:slib
++include common/library:speech:espeak
++include common/library:spell-checking:enchant
++include common/library:unixodbc
++include common/library:xdg:consolekit
++include common/library:xdg:xdg-user-dirs
++include common/library:xmlrpc-c
++include common/library:zlib
++include common/mail:evolution
++include common/mail:evolution:connector:evolution-exchange
++include common/mail:evolution:connector:evolution-jescs
++include common/mail:evolution:connector:evolution-webcal
++include common/mail:fetchmail
++include common/mail:mutt
++include common/mail:procmail
++include common/mail:thunderbird
++#include common/mail:thunderbird:locale:de
++#include common/mail:thunderbird:locale:es
++#include common/mail:thunderbird:locale:extra
++#include common/mail:thunderbird:locale:fr
++#include common/mail:thunderbird:locale:it
++#include common/mail:thunderbird:locale:ja
++#include common/mail:thunderbird:locale:ko
++#include common/mail:thunderbird:locale:pl
++#include common/mail:thunderbird:locale:pt_br
++#include common/mail:thunderbird:locale:ru
++#include common/mail:thunderbird:locale:sv
++#include common/mail:thunderbird:locale:zh_cn
++#include common/mail:thunderbird:locale:zh_tw
++#include common/mail:thunderbird:plugin:plugin-lightning
++include common/mail:thunderbird:plugin:thunderbird-lightning
++include common/media:cdrtools
++include common/media:dvd+rw-tools
++include common/media:mtx
++include common/network:chat:ircii
++include common/network:chat:irssi
++include common/network:dns:bind
++include common/network:ftp:lftp
++include common/network:ftp:ncftp
++include common/network:nntp:slrn
++include common/network:rsync
++include common/network:rtorrent
++include common/network:tor
++include common/network:unison
++include common/package:rpm
++include common/print:cups
++include common/print:cups:filter:foomatic-db
++include common/print:cups:filter:foomatic-db-engine
++include common/print:cups:hal-cups-utils
++include common/print:cups:system-config-printer
++include common/print:filter:ghostscript
++include common/print:filter:ghostscript:fonts:gnu-gs-fonts-other
++include common/print:filter:ghostscript:fonts:gnu-gs-fonts-std
++include common/print:filter:gutenprint
++include common/print:filter:hplip
++include common/print:lp:filter:a2ps
++include common/print:lp:filter:foomatic-ppds
++include common/print:lp:filter:foomatic-rip
++include common/print:lp:print-manager
++include common/print:psutils
++#include common/release:getting-started
++#include common/release:getting-started:locale:de
++#include common/release:getting-started:locale:es
++#include common/release:getting-started:locale:extra
++#include common/release:getting-started:locale:fr
++#include common/release:getting-started:locale:it
++#include common/release:getting-started:locale:ja
++#include common/release:getting-started:locale:ko
++#include common/release:getting-started:locale:pt_br
++#include common/release:getting-started:locale:ru
++#include common/release:getting-started:locale:sv
++#include common/release:getting-started:locale:zh_cn
++#include common/release:getting-started:locale:zh_hk
++#include common/release:getting-started:locale:zh_tw
++#include common/release:opensolaris-welcome
++include common/release:openindiana-welcome
++include common/runtime:clisp
++include common/runtime:dosbox
++include common/runtime:erlang
++include common/runtime:erlang:documentation
++include common/runtime:java:beanshell
++include common/runtime:java:jruby
++include common/runtime:lua
++include common/runtime:ocaml
++include common/runtime:ocaml:lablgtk
++include common/runtime:perl-510
++include common/runtime:perl-510:extra
++include common/runtime:python-24
++include common/runtime:python-25
++include common/runtime:python-26
++include common/runtime:ruby-18
++include common/runtime:tcl-8
++include common/runtime:tcl-8:snack
++include common/runtime:tcl-8:tcl-openssl
++include common/runtime:tcl-8:tcl-sqlite-3
++include common/runtime:tk-8
++include common/security:sudo
++include common/service:database:postgres-82
++include common/service:database:postgres-83
++include common/service:database:postgres-84
++include common/service:gnome:desktop-cache
++include common/service:memcached
++include common/service:network:dns:bind
++include common/service:network:load-balancer:pen
++include common/service:network:ntp
++include common/service:network:samba
++include common/service:network:sip:ser
++include common/service:network:sip:ser:administration
++include common/service:postrun
++include common/service:security:stunnel
++include common/service:storage:zfs-auto-snapshot
++include common/shell:bash
++include common/shell:conflict
++include common/shell:expect
++include common/shell:pdsh
++include common/shell:pipe-viewer
++include common/shell:shmux
++include common/shell:tcsh
++include common/shell:which
++include common/shell:zsh
++include common/storage:fsexam
++include common/SUNWgnome-themes
++include common/SUNWusbccid
++#include common/system:desktop:locale:cs
++#include common/system:desktop:locale:de
++#include common/system:desktop:locale:es
++#include common/system:desktop:locale:extra
++#include common/system:desktop:locale:fr
++#include common/system:desktop:locale:hu
++#include common/system:desktop:locale:it
++#include common/system:desktop:locale:ja
++#include common/system:desktop:locale:ko
++#include common/system:desktop:locale:noinst
++#include common/system:desktop:locale:pl
++#include common/system:desktop:locale:pt_br
++#include common/system:desktop:locale:rtl
++#include common/system:desktop:locale:ru
++#include common/system:desktop:locale:sv
++#include common/system:desktop:locale:zh_cn
++#include common/system:desktop:locale:zh_hk
++#include common/system:desktop:locale:zh_tw
++#include common/system:desktop:stardict
++include common/system:display-manager:desktop-startup
++include common/system:display-manager:gdm
++include common/system:display-manager:openindiana-gdm-themes
++include common/system:file:logrotate
++include common/system:font:gnome-fonts
++include common/system:ipmi:ipmitool
++include common/system:library:dbus
++include common/system:library:flex-runtime
++include common/system:library:gcc-3-runtime
++include common/system:library:libdbus
++include common/system:library:libdbus-glib
++include common/system:library:libnet
++include common/system:library:libpcap
++include common/system:library:security:libgcrypt
++include common/system:library:security:libmcrypt
++include common/system:library:usb:libusb
++include common/system:library:usb:libusbugen
++include common/system:library:usb:openusb
++include common/system:management:cim:pegasus
++include common/system:management:freeipmi
++include common/system:management:powerman
++include common/system:management:snmp:net-snmp
++include common/system:management:snmp:net-snmp:addons
++include common/system:management:snmp:net-snmp:documentation
++include common/system:management:wbem:cimple
++include common/system:management:wbem:sblim-cim-client
++include common/system:management:wbem:wbemcli
++include common/system:management:web:openwsman
++include common/system:management:webmin
++include common/system:network:avahi
++include common/system:network:routing:quagga
++include common/system:prerequisite:gnu
++include common/system:storage:sg3_utils
++include common/terminal:conman
++include common/terminal:dialog
++include common/terminal:gnome-terminal
++include common/terminal:mrxvt
++include common/terminal:pconsole
++include common/terminal:screen
++include common/terminal:tack
++include common/terminal:terminator
++include common/text:convmv
++include common/text:diffstat
++include common/text:dwdiff
++include common/text:gawk
++include common/text:gnu-diffutils
++include common/text:gnu-gettext
++include common/text:gnu-grep
++include common/text:gnu-patch
++include common/text:gnu-sed
++include common/text:groff
++include common/text:idzebra
++include common/text:less
++include common/text:o3read
++include common/text:patchutils
++include common/text:texinfo
++include common/text:tidy
++include common/TrustedExtensions
++include common/web:aget
++include common/web:analytics:awstats
++include common/web:analytics:webalizer
++include common/web:browser:elinks
++include common/web:browser:firefox
++#include common/web:browser:firefox:locale:de_de
++#include common/web:browser:firefox:locale:es_es
++#include common/web:browser:firefox:locale:extra
++#include common/web:browser:firefox:locale:fr_fr
++#include common/web:browser:firefox:locale:hi_in
++#include common/web:browser:firefox:locale:it_it
++#include common/web:browser:firefox:locale:ja_jp
++#include common/web:browser:firefox:locale:ko_kr
++#include common/web:browser:firefox:locale:pl_pl
++#include common/web:browser:firefox:locale:pt_br
++#include common/web:browser:firefox:locale:ru_ru
++#include common/web:browser:firefox:locale:sv_se
++#include common/web:browser:firefox:locale:zh_cn
++#include common/web:browser:firefox:locale:zh_tw
++include common/web:browser:firefox:plugin:firefox-java
++#include common/web:browser:firefox:plugin:plugin-java
++include common/web:browser:links
++include common/web:browser:lynx
++include common/web:browser:w3m
++include common/web:curl
++include common/web:data:firefox-bookmarks
++include common/web:editor:bluefish
++include common/web:fastcgi:spawn-fcgi
++include common/web:java-servlet:tomcat
++include common/web:java-servlet:tomcat:tomcat-examples
++#include common/web:library:apache:apr-13
++#include common/web:library:apache:apr-13:documentation
++#include common/web:library:apache:apr-util-13
++#include common/web:library:apache:apr-util-13:apr-ldap
++#include common/web:library:apache:apr-util-13:dbd-mysql
++#include common/web:library:apache:apr-util-13:dbd-pgsql
++#include common/web:library:apache:apr-util-13:dbd-sqlite
++#include common/web:library:apache:apr-util-13:documentation
++include common/web:php-52
++include common/web:php-52:documentation
++include common/web:php-52:extension:php-apc
++include common/web:php-52:extension:php-idn
++include common/web:php-52:extension:php-memcache
++include common/web:php-52:extension:php-mysql
++include common/web:php-52:extension:php-pear
++include common/web:php-52:extension:php-pgsql
++include common/web:php-52:extension:php-suhosin
++include common/web:php-52:extension:php-tcpwrap
++include common/web:php-52:extension:php-xdebug
++include common/web:proxy:privoxy
++include common/web:proxy:squid
++include common/web:server:apache-13
++include common/web:server:apache-13:documentation
++include common/web:server:apache-22
++include common/web:server:apache-22:documentation
++include common/web:server:apache-22:module:apache-dtrace
++include common/web:server:apache-22:module:apache-fcgid
++include common/web:server:apache-22:module:apache-jk
++include common/web:server:apache-22:module:apache-php5
++include common/web:server:apache-22:module:apache-proxy_html
++include common/web:server:apache-22:module:apache-security
++include common/web:server:apache-22:module:apache-sed
++include common/web:server:apache-22:module:apache-xml2enc
++#include common/web:server:apache-22:plugin:plugin-dtrace
++#include common/web:server:apache-22:plugin:plugin-fastcgi
++#include common/web:server:apache-22:plugin:plugin-html-plugin
++#include common/web:server:apache-22:plugin:plugin-php52
++#include common/web:server:apache-22:plugin:plugin-security
++#include common/web:server:apache-22:plugin:plugin-sed
++#include common/web:server:apache-22:plugin:plugin-tomcat
++#include common/web:server:apache-22:plugin:plugin-xml2enc
++include common/web:server:ejabberd
++#include common/web:server:lighttpd
++include common/web:server:lighttpd-14
++include common/web:wget
++$(i386_ONLY)include i386/desktop:administration:gparted
++$(i386_ONLY)include i386/desktop:avant-window-navigator
++$(i386_ONLY)include i386/desktop:compiz:ccsm
++$(i386_ONLY)include i386/desktop:compiz:library:compizconfig-gconf
++$(i386_ONLY)include i386/desktop:compiz:library:libcompizconfig
++$(i386_ONLY)include i386/desktop:compiz:plugin:compiz-fusion-extra
++$(i386_ONLY)include i386/desktop:compiz:plugin:compiz-fusion-main
++$(i386_ONLY)include i386/desktop:media-player:moovida
++$(i386_ONLY)include i386/desktop:media-player:moovida:moovida-plugins
++$(i386_ONLY)include i386/desktop:virt-manager
++$(i386_ONLY)include i386/diagnostic:acpidump
++$(i386_ONLY)include i386/editor:blog:drivel
++$(i386_ONLY)include i386/library:desktop:clutter
++$(i386_ONLY)include i386/library:desktop:clutter:clutter-gst
++$(i386_ONLY)include i386/library:desktop:clutter:clutter-gtk
++$(i386_ONLY)include i386/library:desktop:pigment
++$(i386_ONLY)include i386/library:python-2:python-compizconfig-26
++$(i386_ONLY)include i386/library:python-2:python-pigment-26
++$(i386_ONLY)include i386/library:python-2:python-sexy-24
+diff --git a/src/util/distro-import/Makefile b/src/util/distro-import/Makefile
+--- a/src/util/distro-import/Makefile
++++ b/src/util/distro-import/Makefile
+@@ -35,31 +35,40 @@
+ # Needs to point to filesystem on Solaris install dvd
+ # replace as needed with a local solaris install image
+ #
+-WOS_PKGS_BASE=/net/paradise.sfbay/export/integrate_dock/nv/nv$(ARCH_INITIAL)_wos_$(BUILDID)
++WOS_PKGS_BASE=/export/releng/oi$(ARCH_INITIAL)_wos_$(BUILDID)
+ WOS_PKGS=$(WOS_PKGS_BASE)/$(ARCH)
+ WOS_EXTRA_PKGS=$(WOS_PKGS_BASE)/all
+ NONWOS_DOCK=nv_osoldev
+-NONWOS_PKGS=/net/paradise.sfbay/export/integrate_dock/nv/$(NONWOS_DOCK)/all \
++#NONWOS_PKGS=/net/paradise.sfbay/export/integrate_dock/nv/$(NONWOS_DOCK)/all \
+             /net/paradise.sfbay/export/integrate_dock/nv/$(NONWOS_DOCK)/$(ARCH)
++NONWOS_PKGS=
+ 
+ TEST_PKGS=
+-REPO=file:///stash/pkg/ossnap_$(BUILDID)
+-ON_REPO=file:///builds/work/onnv/onnv-build/packages/i386/nightly-nd/repo.redist
+-INSTALL_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/caiman_$(BUILDID)/packages/i386/nightly-nd/repo.redist
+-IPS_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/pkg_$(BUILDID)/packages/i386/repo
+-X_REPO=file:///builds/work/xnv/xnv-ips/proto/pkg_i386
++REPO=file:///export/releng/oi_$(BUILDID)/repo
++#ON_REPO=file:///builds/work/onnv/onnv-build/packages/i386/nightly-nd/repo.redist
++ON_REPO=file:///export/releng/oi_$(BUILDID)/on-nightly/repo.redist
++#INSTALL_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/caiman_$(BUILDID)/packages/i386/nightly-nd/repo.redist
++INSTALL_REPO=file:///export/releng/oi_$(BUILDID)/caiman/nightly-nd/repo.redist
++#IPS_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/pkg_$(BUILDID)/packages/i386/repo
++IPS_REPO=file:///export/releng/oi_$(BUILDID)/pkg5-nightly/pkg5-nightly
++#X_REPO=file:///builds/work/xnv/xnv-ips/proto/pkg_i386
++X_REPO=file:///export/releng/oi_$(BUILDID)/xnv-148
++VPANELS_REPO=file:///export/releng/oi_$(BUILDID)/vpanels
++SOLARIS_RE_REPO=file:///export/releng/oi_$(BUILDID)/openindiana/solaris_re/repo
+ 
+ BUILDID_NORESPIN=/usr/bin/echo $(BUILDID) | sed -e 's/\([0-9]\)[a-z]*$$/\1/g'
+ 
+-REF_REPO=file:///stash/pkg/redist_134
+-REF_URIS=$(REF_REPO)@consolidation/solaris_re/[email protected],5.11-0.134 \
+-	$(REF_REPO)@consolidation/vpanels/[email protected],5.11-0.134 \
++#REF_REPO=file:///stash/pkg/redist_134
++REF_REPO=http://pkg.openindiana.org/legacy
++#	$(REF_REPO)@consolidation/vpanels/[email protected],5.11-0.134
++#	$(REF_REPO)@consolidation/gnome/[email protected]
++#	$(REF_REPO)@consolidation/gnome_l10n/[email protected]
++#	$(REF_REPO)@consolidation/solaris_re/[email protected],5.11-0.134 
++REF_URIS= \
+ 	$(REF_REPO)@consolidation/nspg/[email protected] \
+ 	$(REF_REPO)@consolidation/sunpro/[email protected] \
+ 	$(REF_REPO)@consolidation/hcts/[email protected] \
+ 	$(REF_REPO)@consolidation/ub_javavm/[email protected] \
+-	$(REF_REPO)@consolidation/gnome_l10n/[email protected] \
+-	$(REF_REPO)@consolidation/gnome/[email protected] \
+ 	$(REF_REPO)@consolidation/gfx/[email protected] \
+ 	$(REF_REPO)@consolidation/smcc/[email protected] \
+ 	$(REF_REPO)@consolidation/sic_team/[email protected] \
+@@ -115,11 +124,31 @@
+ 	-R $(X_REPO)@consolidation/X/[email protected].$(BUILDID) \
+ 	-E consolidation/X/[email protected].$(BUILDID)
+ 
++X_CONSOLIDATION_OPTIONS_147 = \
++	-C X \
++	-R $(X_REPO)@consolidation/X/[email protected] \
++	-E consolidation/X/[email protected]
++
+ IPS_CONSOLIDATION_OPTIONS = \
+ 	-C ips \
+ 	-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)
++
++VPANELS_CONSOLIDATION_OPTIONS_147 = \
++	-C vpanels \
++	-R $(VPANELS_REPO)@consolidation/vpanels/[email protected].$(BUILDID).1 \
++        -E consolidation/vpanels/[email protected].$(BUILDID).1
++
++SOLARIS_RE_CONSOLIDATION_OPTIONS = \
++	-C solaris_re \
++	-R $(SOLARIS_RE_REPO)@consolidation/solaris_re/[email protected].$(BUILDID) \
++	-E consolidation/solaris_re/[email protected].$(BUILDID) 
++
+ CONSOLIDATION_OPTIONS_136 = \
+ 	$(OSNET_CONSOLIDATION_OPTIONS)
+ CONSOLIDATION_OPTIONS_137 = $(CONSOLIDATION_OPTIONS_136)
+@@ -135,7 +164,11 @@
+ CONSOLIDATION_OPTIONS_145 = $(CONSOLIDATION_OPTIONS_144) \
+ 	$(IPS_CONSOLIDATION_OPTIONS)
+ CONSOLIDATION_OPTIONS_146 = $(CONSOLIDATION_OPTIONS_145)
+-CONSOLIDATION_OPTIONS_147 = $(CONSOLIDATION_OPTIONS_145)
++CONSOLIDATION_OPTIONS_147 = $(CONSOLIDATION_OPTIONS_143) \
++	$(IPS_CONSOLIDATION_OPTIONS) \
++	$(X_CONSOLIDATION_OPTIONS_147) \
++	$(VPANELS_CONSOLIDATION_OPTIONS_147) \
++	$(SOLARIS_RE_CONSOLIDATION_OPTIONS)
+ CONSOLIDATION_OPTIONS = $(CONSOLIDATION_OPTIONS_$(BUILDID))
+ 
+ GLOBAL_CHATTRS_BASE=	\
+diff --git a/src/util/publish/Makefile b/src/util/publish/Makefile
+--- a/src/util/publish/Makefile
++++ b/src/util/publish/Makefile
+@@ -22,11 +22,13 @@
+ # Use is subject to license terms.
+ #
+ ARCH:sh=	uname -p
+-REPO=file:///stash/pkg/ossnap_$(BUILDID)
+-ON_REPO=file:///builds/work/onnv/onnv-build/packages/i386/nightly-nd/repo.redist
+-INSTALL_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/caiman_$(BUILDID)/packages/i386/nightly-nd/repo.redist
+-IPS_REPO=file:///builds/work/os-snap/os-snap_$(BUILDID)/pkg_$(BUILDID)/packages/i386/repo
+-X_REPO=file:///builds/work/xnv/xnv-ips/proto/pkg_i386
++REPO=file:///export/releng/oi_$(BUILDID)/repo
++ON_REPO=file:///export/releng/oi_$(BUILDID)/on-nightly/repo.redist
++INSTALL_REPO=file:///export/releng/oi_$(BUILDID)/caiman/nightly-nd/repo.redist
++IPS_REPO=file:///export/releng/oi_$(BUILDID)/pkg5-nightly/pkg5-nightly
++X_REPO=file:///export/releng/oi_$(BUILDID)/xnv-148
++VPANELS_REPO=file:///export/releng/oi_$(BUILDID)/vpanels
++SOLARIS_RE_REPO=file:///export/releng/oi_$(BUILDID)/openindiana/solaris_re/repo
+ 
+ MERGEDIR=../../../proto/merge
+ SETPUBLISHERDIR=../../../proto/set-publisher
+@@ -59,12 +61,14 @@
+ 	do PYTHONPATH=$(PYTHONPATH) ./pkg_publish $(MERGEDIR)/$$var $(REPO); done
+ 
+ publish_setpublisher: $(SETPUBLISHERDIR)
+-	PYTHONPATH=$(PYTHONPATH) PATH=$(PKGPATH):$$PATH ./set-publisher.sh -b $(BUILDID) \
++	PYTHONPATH=$(PYTHONPATH) PATH=$(PKGPATH):$$PATH ./set-publisher.sh \
+ 		-d $(SETPUBLISHERDIR) -p $(REPO) \
+ 		$(ON_REPO) \
+ 		$(INSTALL_REPO) \
+ 		$(X_REPO) \
+-		$(IPS_REPO)
++		$(IPS_REPO) \
++		$(VPANELS_REPO) \
++		$(SOLARIS_RE_REPO)
+ 
+ clean:
+ 
+diff --git a/src/util/publish/set-publisher.transforms b/src/util/publish/set-publisher.transforms
+--- a/src/util/publish/set-publisher.transforms
++++ b/src/util/publish/set-publisher.transforms
+@@ -1,4 +1,4 @@
+-<transform set name=pkg.fmri -> edit value pkg://[^/]+/ pkg://os-snap/>
++<transform set name=pkg.fmri -> edit value pkg://[^/]+/ pkg://openindiana.org/>
+ 
+ # These are needed until 14870 is fixed.
+ <transform file depend -> delete pkg.debug.depend.file .*>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/series	Fri Sep 17 14:50:20 2010 +0100
@@ -0,0 +1,1 @@
+oi-releng-distro-import