--- a/components/python/python26/python-26.p5m Wed Apr 13 10:10:46 2011 -0600
+++ b/components/python/python26/python-26.p5m Wed Apr 13 09:58:06 2011 -0700
@@ -21,13 +21,17 @@
# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/runtime/python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+set name=pkg.fmri \
+ value=pkg:/runtime/python-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Python interpreter, libraries and utilities"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream_url value="http://python.org/"
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://python.org/
+set name=opensolaris.arc_url \
+ value=http://arc.opensolaris.org/caselog/PSARC/2009/043
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
dir path=usr
dir path=usr/bin
dir path=usr/bin/$(MACH32)
@@ -37,6 +41,7 @@
dir path=usr/lib
dir path=usr/lib/$(MACH64)
dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6
dir path=usr/lib/python2.6/compiler
dir path=usr/lib/python2.6/config
dir path=usr/lib/python2.6/ctypes
@@ -57,6 +62,8 @@
dir path=usr/lib/python2.6/json
dir path=usr/lib/python2.6/json/tests
dir path=usr/lib/python2.6/lib-dynload
+dir path=usr/lib/python2.6/lib-dynload
+dir path=usr/lib/python2.6/lib-dynload/64
dir path=usr/lib/python2.6/lib-old
dir path=usr/lib/python2.6/lib-tk
dir path=usr/lib/python2.6/lib2to3
@@ -72,47 +79,29 @@
dir path=usr/lib/python2.6/sqlite3/test
dir path=usr/lib/python2.6/test
dir path=usr/lib/python2.6/test/decimaltestdata
+dir path=usr/lib/python2.6/vendor-packages
dir path=usr/lib/python2.6/wsgiref
-dir path=usr/lib/python2.6/vendor-packages
dir path=usr/lib/python2.6/xml
dir path=usr/lib/python2.6/xml/dom
dir path=usr/lib/python2.6/xml/etree
dir path=usr/lib/python2.6/xml/parsers
dir path=usr/lib/python2.6/xml/sax
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/lib-dynload
-dir path=usr/lib/python2.6/lib-dynload/64
dir path=usr/share
dir path=usr/share/man
dir path=usr/share/man/man1
+# isapython2.6
+file usr/bin/python2.6 path=usr/bin/$(MACH32)/isapython2.6
+file usr/bin/$(MACH64)/python2.6 path=usr/bin/$(MACH64)/isapython2.6
+file path=usr/bin/$(MACH64)/python2.6-config pkg.depend.bypass-generate=.*
+
# delivered from python-24, but should be delivered from here
#file path=usr/bin/idle
#file path=usr/bin/pydoc
file path=usr/bin/2to3
-
-# isapython2.6
-file usr/bin/python2.6 path=usr/bin/$(MACH32)/isapython2.6
-file usr/bin/$(MACH64)/python2.6 path=usr/bin/$(MACH64)/isapython2.6
-hardlink path=usr/bin/isapython2.6 target=../lib/isaexec pkg.linted=true
-
-# python2.6
-link path=usr/bin/python target=python2.6
-link path=usr/bin/python2.6 target=$(MACH32)/isapython2.6
-link path=usr/bin/$(MACH64)/python target=python2.6
-link path=usr/bin/$(MACH64)/python2.6 target=isapython2.6
-
-link path=usr/bin/python-config target=python2.6-config
file path=usr/bin/python2.6-config
-file path=usr/bin/$(MACH64)/python2.6-config pkg.depend.bypass-generate=.*
-
-link path=usr/lib/$(MACH64)/libpython2.6_db.so target=libpython2.6_db.so.1.0
-file path=usr/lib/$(MACH64)/libpython2.6_db.so.1.0
-link path=usr/lib/libpython2.6_db.so target=libpython2.6_db.so.1.0
-file path=usr/lib/libpython2.6_db.so.1.0
-
file path=usr/include/python2.6/Python-ast.h
file path=usr/include/python2.6/Python.h
file path=usr/include/python2.6/abstract.h
@@ -202,7 +191,9 @@
file path=usr/include/python2.6/warnings.h
file path=usr/include/python2.6/weakrefobject.h
file path=usr/lib/$(MACH64)/libpython2.6.so.1.0
+file path=usr/lib/$(MACH64)/libpython2.6_db.so.1.0
file path=usr/lib/libpython2.6.so.1.0
+file path=usr/lib/libpython2.6_db.so.1.0
file path=usr/lib/python2.6/BaseHTTPServer.py
file path=usr/lib/python2.6/BaseHTTPServer.pyc
file path=usr/lib/python2.6/Bastion.py
@@ -1227,6 +1218,75 @@
file path=usr/lib/python2.6/json/tool.pyc
file path=usr/lib/python2.6/keyword.py
file path=usr/lib/python2.6/keyword.pyc
+file path=usr/lib/python2.6/lib-dynload/64/_bisect.so
+file path=usr/lib/python2.6/lib-dynload/64/_bytesio.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_cn.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_hk.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_iso2022.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_jp.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_kr.so
+file path=usr/lib/python2.6/lib-dynload/64/_codecs_tw.so
+file path=usr/lib/python2.6/lib-dynload/64/_collections.so
+file path=usr/lib/python2.6/lib-dynload/64/_csv.so
+file path=usr/lib/python2.6/lib-dynload/64/_ctypes.so
+file path=usr/lib/python2.6/lib-dynload/64/_ctypes_test.so
+file path=usr/lib/python2.6/lib-dynload/64/_curses.so
+file path=usr/lib/python2.6/lib-dynload/64/_curses_panel.so
+file path=usr/lib/python2.6/lib-dynload/64/_elementtree.so
+file path=usr/lib/python2.6/lib-dynload/64/_fileio.so
+file path=usr/lib/python2.6/lib-dynload/64/_functools.so
+file path=usr/lib/python2.6/lib-dynload/64/_hashlib.so
+file path=usr/lib/python2.6/lib-dynload/64/_heapq.so
+file path=usr/lib/python2.6/lib-dynload/64/_hotshot.so
+file path=usr/lib/python2.6/lib-dynload/64/_json.so
+file path=usr/lib/python2.6/lib-dynload/64/_locale.so
+file path=usr/lib/python2.6/lib-dynload/64/_lsprof.so
+file path=usr/lib/python2.6/lib-dynload/64/_multibytecodec.so
+file path=usr/lib/python2.6/lib-dynload/64/_multiprocessing.so
+file path=usr/lib/python2.6/lib-dynload/64/_random.so
+file path=usr/lib/python2.6/lib-dynload/64/_socket.so
+file path=usr/lib/python2.6/lib-dynload/64/_sqlite3.so
+file path=usr/lib/python2.6/lib-dynload/64/_ssl.so
+file path=usr/lib/python2.6/lib-dynload/64/_struct.so
+file path=usr/lib/python2.6/lib-dynload/64/_testcapi.so
+file path=usr/lib/python2.6/lib-dynload/64/_tkinter.so
+file path=usr/lib/python2.6/lib-dynload/64/_weakref.so
+file path=usr/lib/python2.6/lib-dynload/64/array.so
+file path=usr/lib/python2.6/lib-dynload/64/audioop.so
+file path=usr/lib/python2.6/lib-dynload/64/binascii.so
+file path=usr/lib/python2.6/lib-dynload/64/bz2.so
+file path=usr/lib/python2.6/lib-dynload/64/cPickle.so
+file path=usr/lib/python2.6/lib-dynload/64/cStringIO.so
+file path=usr/lib/python2.6/lib-dynload/64/cmath.so
+file path=usr/lib/python2.6/lib-dynload/64/crypt.so
+file path=usr/lib/python2.6/lib-dynload/64/datetime.so
+file path=usr/lib/python2.6/lib-dynload/64/dbm.so
+file path=usr/lib/python2.6/lib-dynload/64/dlpi.so
+file path=usr/lib/python2.6/lib-dynload/64/fcntl.so
+file path=usr/lib/python2.6/lib-dynload/64/future_builtins.so
+file path=usr/lib/python2.6/lib-dynload/64/gdbm.so
+file path=usr/lib/python2.6/lib-dynload/64/grp.so
+file path=usr/lib/python2.6/lib-dynload/64/itertools.so
+file path=usr/lib/python2.6/lib-dynload/64/math.so
+file path=usr/lib/python2.6/lib-dynload/64/mmap.so
+file path=usr/lib/python2.6/lib-dynload/64/nis.so
+file path=usr/lib/python2.6/lib-dynload/64/operator.so
+file path=usr/lib/python2.6/lib-dynload/64/parser.so
+file path=usr/lib/python2.6/lib-dynload/64/privileges.so
+file path=usr/lib/python2.6/lib-dynload/64/pyexpat.so
+file path=usr/lib/python2.6/lib-dynload/64/rbac.so
+file path=usr/lib/python2.6/lib-dynload/64/readline.so
+file path=usr/lib/python2.6/lib-dynload/64/resource.so
+file path=usr/lib/python2.6/lib-dynload/64/select.so
+file path=usr/lib/python2.6/lib-dynload/64/spwd.so
+file path=usr/lib/python2.6/lib-dynload/64/strop.so
+file path=usr/lib/python2.6/lib-dynload/64/sunaudiodev.so
+file path=usr/lib/python2.6/lib-dynload/64/syslog.so
+file path=usr/lib/python2.6/lib-dynload/64/termios.so
+file path=usr/lib/python2.6/lib-dynload/64/time.so
+file path=usr/lib/python2.6/lib-dynload/64/ucred.so
+file path=usr/lib/python2.6/lib-dynload/64/unicodedata.so
+file path=usr/lib/python2.6/lib-dynload/64/zlib.so
file path=usr/lib/python2.6/lib-dynload/Python-2.6.4-py2.6.egg-info
file path=usr/lib/python2.6/lib-dynload/_bisect.so
file path=usr/lib/python2.6/lib-dynload/_bytesio.so
@@ -1473,21 +1533,27 @@
file path=usr/lib/python2.6/lib2to3/refactor.pyc
file path=usr/lib/python2.6/lib2to3/tests/__init__.py
file path=usr/lib/python2.6/lib2to3/tests/__init__.pyc
-file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.py \
+ pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/lib2to3/tests/pytree_idempotency.pyc
file path=usr/lib/python2.6/lib2to3/tests/support.py
file path=usr/lib/python2.6/lib2to3/tests/support.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.py \
+ pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/lib2to3/tests/test_all_fixers.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_fixers.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_fixers.py \
+ pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/lib2to3/tests/test_fixers.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_parser.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_parser.py \
+ pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/lib2to3/tests/test_parser.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_pytree.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_pytree.py \
+ pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/lib2to3/tests/test_pytree.pyc
file path=usr/lib/python2.6/lib2to3/tests/test_refactor.py
file path=usr/lib/python2.6/lib2to3/tests/test_refactor.pyc
-file path=usr/lib/python2.6/lib2to3/tests/test_util.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/lib2to3/tests/test_util.py \
+ pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/lib2to3/tests/test_util.pyc
file path=usr/lib/python2.6/linecache.py
file path=usr/lib/python2.6/linecache.pyc
@@ -1617,10 +1683,9 @@
file path=usr/lib/python2.6/pstats.pyc
file path=usr/lib/python2.6/pty.py
file path=usr/lib/python2.6/pty.pyc
-link path=usr/lib/python2.6/pyCC target=pycc
-file path=usr/lib/python2.6/pycc mode=0555
file path=usr/lib/python2.6/py_compile.py
file path=usr/lib/python2.6/py_compile.pyc
+file path=usr/lib/python2.6/pycc mode=0555
file path=usr/lib/python2.6/pyclbr.py
file path=usr/lib/python2.6/pyclbr.pyc
file path=usr/lib/python2.6/pydoc.py pkg.depend.bypass-generate=.*
@@ -1760,9 +1825,9 @@
file path=usr/lib/python2.6/test/buffer_tests.py
file path=usr/lib/python2.6/test/buffer_tests.pyc
file path=usr/lib/python2.6/test/cfgparser.1
-file path=usr/lib/python2.6/test/check_soundcard.vbs
file usr/bin/check_offset path=usr/lib/python2.6/test/check_offset
file usr/bin/$(MACH64)/check_offset path=usr/lib/python2.6/test/check_offset64
+file path=usr/lib/python2.6/test/check_soundcard.vbs
file path=usr/lib/python2.6/test/cjkencodings_test.py
file path=usr/lib/python2.6/test/cjkencodings_test.pyc
file path=usr/lib/python2.6/test/cmath_testcases.txt
@@ -2855,90 +2920,26 @@
file path=usr/lib/python2.6/xmlrpclib.pyc
file path=usr/lib/python2.6/zipfile.py
file path=usr/lib/python2.6/zipfile.pyc
-file path=usr/lib/python2.6/lib-dynload/64/_bisect.so
-file path=usr/lib/python2.6/lib-dynload/64/_bytesio.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_cn.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_hk.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_iso2022.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_jp.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_kr.so
-file path=usr/lib/python2.6/lib-dynload/64/_codecs_tw.so
-file path=usr/lib/python2.6/lib-dynload/64/_collections.so
-file path=usr/lib/python2.6/lib-dynload/64/_csv.so
-file path=usr/lib/python2.6/lib-dynload/64/_ctypes.so
-file path=usr/lib/python2.6/lib-dynload/64/_ctypes_test.so
-file path=usr/lib/python2.6/lib-dynload/64/_curses.so
-file path=usr/lib/python2.6/lib-dynload/64/_curses_panel.so
-file path=usr/lib/python2.6/lib-dynload/64/_elementtree.so
-file path=usr/lib/python2.6/lib-dynload/64/_fileio.so
-file path=usr/lib/python2.6/lib-dynload/64/_functools.so
-file path=usr/lib/python2.6/lib-dynload/64/_hashlib.so
-file path=usr/lib/python2.6/lib-dynload/64/_heapq.so
-file path=usr/lib/python2.6/lib-dynload/64/_hotshot.so
-file path=usr/lib/python2.6/lib-dynload/64/_json.so
-file path=usr/lib/python2.6/lib-dynload/64/_locale.so
-file path=usr/lib/python2.6/lib-dynload/64/_lsprof.so
-file path=usr/lib/python2.6/lib-dynload/64/_multibytecodec.so
-file path=usr/lib/python2.6/lib-dynload/64/_multiprocessing.so
-file path=usr/lib/python2.6/lib-dynload/64/_random.so
-file path=usr/lib/python2.6/lib-dynload/64/_socket.so
-file path=usr/lib/python2.6/lib-dynload/64/_sqlite3.so
-file path=usr/lib/python2.6/lib-dynload/64/_ssl.so
-file path=usr/lib/python2.6/lib-dynload/64/_struct.so
-file path=usr/lib/python2.6/lib-dynload/64/_testcapi.so
-file path=usr/lib/python2.6/lib-dynload/64/_tkinter.so
-file path=usr/lib/python2.6/lib-dynload/64/_weakref.so
-file path=usr/lib/python2.6/lib-dynload/64/array.so
-file path=usr/lib/python2.6/lib-dynload/64/audioop.so
-file path=usr/lib/python2.6/lib-dynload/64/binascii.so
-file path=usr/lib/python2.6/lib-dynload/64/bz2.so
-file path=usr/lib/python2.6/lib-dynload/64/cPickle.so
-file path=usr/lib/python2.6/lib-dynload/64/cStringIO.so
-file path=usr/lib/python2.6/lib-dynload/64/cmath.so
-file path=usr/lib/python2.6/lib-dynload/64/crypt.so
-file path=usr/lib/python2.6/lib-dynload/64/datetime.so
-file path=usr/lib/python2.6/lib-dynload/64/dbm.so
-file path=usr/lib/python2.6/lib-dynload/64/dlpi.so
-file path=usr/lib/python2.6/lib-dynload/64/fcntl.so
-file path=usr/lib/python2.6/lib-dynload/64/future_builtins.so
-file path=usr/lib/python2.6/lib-dynload/64/gdbm.so
-file path=usr/lib/python2.6/lib-dynload/64/grp.so
-file path=usr/lib/python2.6/lib-dynload/64/itertools.so
-file path=usr/lib/python2.6/lib-dynload/64/math.so
-file path=usr/lib/python2.6/lib-dynload/64/mmap.so
-file path=usr/lib/python2.6/lib-dynload/64/nis.so
-file path=usr/lib/python2.6/lib-dynload/64/operator.so
-file path=usr/lib/python2.6/lib-dynload/64/parser.so
-file path=usr/lib/python2.6/lib-dynload/64/privileges.so
-file path=usr/lib/python2.6/lib-dynload/64/pyexpat.so
-file path=usr/lib/python2.6/lib-dynload/64/rbac.so
-file path=usr/lib/python2.6/lib-dynload/64/readline.so
-file path=usr/lib/python2.6/lib-dynload/64/resource.so
-file path=usr/lib/python2.6/lib-dynload/64/select.so
-file path=usr/lib/python2.6/lib-dynload/64/spwd.so
-file path=usr/lib/python2.6/lib-dynload/64/strop.so
-file path=usr/lib/python2.6/lib-dynload/64/sunaudiodev.so
-file path=usr/lib/python2.6/lib-dynload/64/syslog.so
-file path=usr/lib/python2.6/lib-dynload/64/termios.so
-file path=usr/lib/python2.6/lib-dynload/64/time.so
-file path=usr/lib/python2.6/lib-dynload/64/ucred.so
-file path=usr/lib/python2.6/lib-dynload/64/unicodedata.so
-file path=usr/lib/python2.6/lib-dynload/64/zlib.so
file usr/share/man/man1/python.1 path=usr/share/man/man1/python2.6.1
-link path=usr/bin/python-config target=python2.6-config
-link path=usr/lib/$(MACH64)/libpython2.6.so target=libpython2.6.so.1.0
-link path=usr/lib/libpython2.6.so target=libpython2.6.so.1.0
-
-license python26.license license="PSFv2"
-
-legacy pkg=SUNWPython26 \
+hardlink path=usr/bin/isapython2.6 pkg.linted=true target=../lib/isaexec
+legacy pkg=SUNWPython26 category=GNOME2,application,JDS4 \
desc="The Python interpreter, libraries and utilities" \
- name="The Python interpreter, libraries and utilities" \
- category="GNOME2,application,JDS4" \
- vendor=Python.org
-
-legacy pkg=SUNWPython26-devel \
+ name="The Python interpreter, libraries and utilities" vendor=Python.org
+legacy pkg=SUNWPython26-devel category=GNOME2,application,JDS4 \
desc="The Python interpreter, libraries and utilities - development files" \
name="The Python interpreter, libraries and utilities - development files" \
- category="GNOME2,application,JDS4" \
vendor=Python.org
+license python26.license license=PSFv2
+link path=usr/bin/$(MACH64)/python target=python2.6
+link path=usr/bin/$(MACH64)/python2.6 target=isapython2.6
+
+# python2.6
+link path=usr/bin/python target=python2.6
+link path=usr/bin/python-config target=python2.6-config
+link path=usr/bin/python-config target=python2.6-config
+link path=usr/bin/python2.6 target=$(MACH32)/isapython2.6
+link path=usr/lib/$(MACH64)/libpython2.6.so target=libpython2.6.so.1.0
+link path=usr/lib/$(MACH64)/libpython2.6_db.so target=libpython2.6_db.so.1.0
+link path=usr/lib/libpython2.6.so target=libpython2.6.so.1.0
+link path=usr/lib/libpython2.6_db.so target=libpython2.6_db.so.1.0
+link path=usr/lib/python2.6/pyCC target=pycc