--- a/components/python/python26/python-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/python26/python-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -31,65 +31,38 @@
value=org.opensolaris.category.2008:Development/Python
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2009/043
+set name=org.opensolaris.arc-caseid value=PSARC/2009/043
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/bin/$(MACH32)
-dir path=usr/bin/$(MACH64)
-dir path=usr/include
-dir path=usr/include/python2.6
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-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
-dir path=usr/lib/python2.6/ctypes/macholib
-dir path=usr/lib/python2.6/curses
-dir path=usr/lib/python2.6/distutils
-dir path=usr/lib/python2.6/distutils/command
-dir path=usr/lib/python2.6/email
-dir path=usr/lib/python2.6/email/mime
-dir path=usr/lib/python2.6/encodings
-dir path=usr/lib/python2.6/hotshot
-dir path=usr/lib/python2.6/idlelib
-dir path=usr/lib/python2.6/idlelib/Icons
-dir path=usr/lib/python2.6/json
-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/lib2to3
-dir path=usr/lib/python2.6/lib2to3/fixes
-dir path=usr/lib/python2.6/lib2to3/pgen2
-dir path=usr/lib/python2.6/logging
-dir path=usr/lib/python2.6/multiprocessing
-dir path=usr/lib/python2.6/multiprocessing/dummy
-dir path=usr/lib/python2.6/plat-sunos5
-dir path=usr/lib/python2.6/site-packages
-dir path=usr/lib/python2.6/sqlite3
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/wsgiref
-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/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir path=usr
+dir path=usr/bin
+dir path=usr/bin/$(MACH32)
# isapython2.6
file usr/bin/python2.6 path=usr/bin/$(MACH32)/isapython2.6
+dir path=usr/bin/$(MACH64)
file usr/bin/$(MACH64)/python2.6 path=usr/bin/$(MACH64)/isapython2.6
+link path=usr/bin/$(MACH64)/python target=python2.6 mediator=python \
+ mediator-version=2.6
+link path=usr/bin/$(MACH64)/python-config target=python2.6-config \
+ mediator=python mediator-version=2.6
+link path=usr/bin/$(MACH64)/python2.6 target=isapython2.6
file path=usr/bin/$(MACH64)/python2.6-config pkg.depend.bypass-generate=.*
-
+link path=usr/bin/2to3 target=2to3-2.6 mediator=python mediator-version=2.6
file usr/bin/2to3 path=usr/bin/2to3-2.6
+link path=usr/bin/idle target=idle-2.6 mediator=python mediator-version=2.6
file usr/bin/idle path=usr/bin/idle-2.6
+hardlink path=usr/bin/isapython2.6 target=../lib/isaexec
+link path=usr/bin/pydoc target=pydoc-2.6 mediator=python mediator-version=2.6
file usr/bin/pydoc path=usr/bin/pydoc-2.6
+link path=usr/bin/python target=python2.6 mediator=python mediator-version=2.6
+link path=usr/bin/python-config target=python2.6-config mediator=python \
+ mediator-version=2.6
+
+# python2.6
+link path=usr/bin/python2.6 target=$(MACH32)/isapython2.6
file path=usr/bin/python2.6-config
-
+dir path=usr/include
+dir path=usr/include/python2.6
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
@@ -178,13 +151,20 @@
file path=usr/include/python2.6/unicodeobject.h
file path=usr/include/python2.6/warnings.h
file path=usr/include/python2.6/weakrefobject.h
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libpython2.6.so target=libpython2.6.so.1.0
file path=usr/lib/$(MACH64)/libpython2.6.so.1.0
+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
file $(MACH64)/llib-lpython26.ln path=usr/lib/$(MACH64)/llib-lpython2.6.ln
+link path=usr/lib/libpython2.6.so target=libpython2.6.so.1.0
file path=usr/lib/libpython2.6.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 llib-lpython26 path=usr/lib/llib-lpython2.6
file $(MACH32)/llib-lpython26.ln path=usr/lib/llib-lpython2.6.ln
+dir path=usr/lib/python2.6
file path=usr/lib/python2.6/BaseHTTPServer.py
file path=usr/lib/python2.6/Bastion.py
file path=usr/lib/python2.6/CGIHTTPServer.py
@@ -234,6 +214,7 @@
file path=usr/lib/python2.6/colorsys.py
file path=usr/lib/python2.6/commands.py
file path=usr/lib/python2.6/compileall.py
+dir path=usr/lib/python2.6/compiler
file path=usr/lib/python2.6/compiler/__init__.py
file path=usr/lib/python2.6/compiler/ast.py
file path=usr/lib/python2.6/compiler/consts.py
@@ -245,6 +226,7 @@
file path=usr/lib/python2.6/compiler/syntax.py
file path=usr/lib/python2.6/compiler/transformer.py
file path=usr/lib/python2.6/compiler/visitor.py
+dir path=usr/lib/python2.6/config
file Makefile.config path=usr/lib/python2.6/config/Makefile
file path=usr/lib/python2.6/config/Setup
file path=usr/lib/python2.6/config/Setup.config
@@ -259,8 +241,10 @@
file path=usr/lib/python2.6/copy.py
file path=usr/lib/python2.6/copy_reg.py
file path=usr/lib/python2.6/csv.py
+dir path=usr/lib/python2.6/ctypes
file path=usr/lib/python2.6/ctypes/__init__.py
file path=usr/lib/python2.6/ctypes/_endian.py
+dir path=usr/lib/python2.6/ctypes/macholib
file path=usr/lib/python2.6/ctypes/macholib/README.ctypes
file path=usr/lib/python2.6/ctypes/macholib/__init__.py
file path=usr/lib/python2.6/ctypes/macholib/dyld.py
@@ -270,6 +254,7 @@
file path=usr/lib/python2.6/ctypes/macholib/framework.py
file path=usr/lib/python2.6/ctypes/util.py
file path=usr/lib/python2.6/ctypes/wintypes.py
+dir path=usr/lib/python2.6/curses
file path=usr/lib/python2.6/curses/__init__.py
file path=usr/lib/python2.6/curses/ascii.py
file path=usr/lib/python2.6/curses/has_key.py
@@ -281,12 +266,14 @@
file path=usr/lib/python2.6/difflib.py pkg.depend.bypass-generate=.*doctest.*
file path=usr/lib/python2.6/dircache.py
file path=usr/lib/python2.6/dis.py
+dir path=usr/lib/python2.6/distutils
file path=usr/lib/python2.6/distutils/README
file path=usr/lib/python2.6/distutils/__init__.py
file path=usr/lib/python2.6/distutils/archive_util.py
file path=usr/lib/python2.6/distutils/bcppcompiler.py
file path=usr/lib/python2.6/distutils/ccompiler.py
file path=usr/lib/python2.6/distutils/cmd.py
+dir path=usr/lib/python2.6/distutils/command
file path=usr/lib/python2.6/distutils/command/__init__.py
file path=usr/lib/python2.6/distutils/command/bdist.py
file path=usr/lib/python2.6/distutils/command/bdist_dumb.py
@@ -343,6 +330,7 @@
file path=usr/lib/python2.6/dumbdbm.py
file path=usr/lib/python2.6/dummy_thread.py
file path=usr/lib/python2.6/dummy_threading.py
+dir path=usr/lib/python2.6/email
file path=usr/lib/python2.6/email/__init__.py
file path=usr/lib/python2.6/email/_parseaddr.py
file path=usr/lib/python2.6/email/base64mime.py
@@ -354,6 +342,7 @@
file path=usr/lib/python2.6/email/header.py
file path=usr/lib/python2.6/email/iterators.py
file path=usr/lib/python2.6/email/message.py
+dir path=usr/lib/python2.6/email/mime
file path=usr/lib/python2.6/email/mime/__init__.py
file path=usr/lib/python2.6/email/mime/application.py
file path=usr/lib/python2.6/email/mime/audio.py
@@ -366,6 +355,7 @@
file path=usr/lib/python2.6/email/parser.py
file path=usr/lib/python2.6/email/quoprimime.py
file path=usr/lib/python2.6/email/utils.py
+dir path=usr/lib/python2.6/encodings
file path=usr/lib/python2.6/encodings/__init__.py
file path=usr/lib/python2.6/encodings/aliases.py
file path=usr/lib/python2.6/encodings/ascii.py
@@ -501,6 +491,7 @@
file path=usr/lib/python2.6/hashlib.py
file path=usr/lib/python2.6/heapq.py
file path=usr/lib/python2.6/hmac.py
+dir path=usr/lib/python2.6/hotshot
file path=usr/lib/python2.6/hotshot/__init__.py
file path=usr/lib/python2.6/hotshot/log.py
file path=usr/lib/python2.6/hotshot/stats.py
@@ -508,6 +499,7 @@
file path=usr/lib/python2.6/htmlentitydefs.py
file path=usr/lib/python2.6/htmllib.py
file path=usr/lib/python2.6/httplib.py
+dir path=usr/lib/python2.6/idlelib
file path=usr/lib/python2.6/idlelib/AutoComplete.py
file path=usr/lib/python2.6/idlelib/AutoCompleteWindow.py
file path=usr/lib/python2.6/idlelib/AutoExpand.py
@@ -528,6 +520,7 @@
file path=usr/lib/python2.6/idlelib/HISTORY.txt
file path=usr/lib/python2.6/idlelib/HyperParser.py
file path=usr/lib/python2.6/idlelib/IOBinding.py
+dir path=usr/lib/python2.6/idlelib/Icons
file path=usr/lib/python2.6/idlelib/Icons/folder.gif
file path=usr/lib/python2.6/idlelib/Icons/idle.icns
file path=usr/lib/python2.6/idlelib/Icons/minusnode.gif
@@ -592,12 +585,15 @@
file path=usr/lib/python2.6/imputil.py
file path=usr/lib/python2.6/inspect.py
file path=usr/lib/python2.6/io.py
+dir path=usr/lib/python2.6/json
file path=usr/lib/python2.6/json/__init__.py
file path=usr/lib/python2.6/json/decoder.py
file path=usr/lib/python2.6/json/encoder.py
file path=usr/lib/python2.6/json/scanner.py
file path=usr/lib/python2.6/json/tool.py
file path=usr/lib/python2.6/keyword.py
+dir path=usr/lib/python2.6/lib-dynload
+dir path=usr/lib/python2.6/lib-dynload/64
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
@@ -733,13 +729,16 @@
file path=usr/lib/python2.6/lib-dynload/ucred.so
file path=usr/lib/python2.6/lib-dynload/unicodedata.so
file path=usr/lib/python2.6/lib-dynload/zlib.so
-file path=usr/lib/python2.6/lib2to3/Grammar.txt
+dir path=usr/lib/python2.6/lib-old
+dir path=usr/lib/python2.6/lib2to3
file path=usr/lib/python2.6/lib2to3/Grammar$(COMPONENT_VERSION).final.0.pickle
+file path=usr/lib/python2.6/lib2to3/Grammar.txt
+file path=usr/lib/python2.6/lib2to3/PatternGrammar$(COMPONENT_VERSION).final.0.pickle
file path=usr/lib/python2.6/lib2to3/PatternGrammar.txt
-file path=usr/lib/python2.6/lib2to3/PatternGrammar$(COMPONENT_VERSION).final.0.pickle
file path=usr/lib/python2.6/lib2to3/__init__.py
file path=usr/lib/python2.6/lib2to3/fixer_base.py
file path=usr/lib/python2.6/lib2to3/fixer_util.py
+dir path=usr/lib/python2.6/lib2to3/fixes
file path=usr/lib/python2.6/lib2to3/fixes/__init__.py
file path=usr/lib/python2.6/lib2to3/fixes/fix_apply.py
file path=usr/lib/python2.6/lib2to3/fixes/fix_basestring.py
@@ -794,6 +793,7 @@
file path=usr/lib/python2.6/lib2to3/fixes/fix_zip.py
file path=usr/lib/python2.6/lib2to3/main.py
file path=usr/lib/python2.6/lib2to3/patcomp.py
+dir path=usr/lib/python2.6/lib2to3/pgen2
file path=usr/lib/python2.6/lib2to3/pgen2/__init__.py
file path=usr/lib/python2.6/lib2to3/pgen2/conv.py
file path=usr/lib/python2.6/lib2to3/pgen2/driver.py
@@ -808,6 +808,7 @@
file path=usr/lib/python2.6/lib2to3/refactor.py pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/linecache.py
file path=usr/lib/python2.6/locale.py
+dir path=usr/lib/python2.6/logging
file path=usr/lib/python2.6/logging/__init__.py
file path=usr/lib/python2.6/logging/config.py
file path=usr/lib/python2.6/logging/handlers.py
@@ -823,8 +824,10 @@
file path=usr/lib/python2.6/mimify.py
file path=usr/lib/python2.6/modulefinder.py
file path=usr/lib/python2.6/multifile.py
+dir path=usr/lib/python2.6/multiprocessing
file path=usr/lib/python2.6/multiprocessing/__init__.py
file path=usr/lib/python2.6/multiprocessing/connection.py
+dir path=usr/lib/python2.6/multiprocessing/dummy
file path=usr/lib/python2.6/multiprocessing/dummy/__init__.py
file path=usr/lib/python2.6/multiprocessing/dummy/connection.py
file path=usr/lib/python2.6/multiprocessing/forking.py
@@ -854,6 +857,7 @@
file path=usr/lib/python2.6/pickletools.py
file path=usr/lib/python2.6/pipes.py
file path=usr/lib/python2.6/pkgutil.py
+dir path=usr/lib/python2.6/plat-sunos5
file path=usr/lib/python2.6/plat-sunos5/CDIO.py
file path=usr/lib/python2.6/plat-sunos5/DLFCN.py
file path=usr/lib/python2.6/plat-sunos5/IN.py
@@ -871,6 +875,7 @@
file path=usr/lib/python2.6/profile.py pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/pstats.py
file path=usr/lib/python2.6/pty.py
+link path=usr/lib/python2.6/pyCC target=pycc
file path=usr/lib/python2.6/py_compile.py
file path=usr/lib/python2.6/pycc mode=0555
file path=usr/lib/python2.6/pyclbr.py
@@ -892,6 +897,7 @@
file path=usr/lib/python2.6/shelve.py
file path=usr/lib/python2.6/shlex.py
file path=usr/lib/python2.6/shutil.py
+dir path=usr/lib/python2.6/site-packages
file path=usr/lib/python2.6/site-packages/README
file path=usr/lib/python2.6/site-packages/vendor-packages.pth
file path=usr/lib/python2.6/site.py
@@ -899,6 +905,7 @@
file path=usr/lib/python2.6/smtplib.py
file path=usr/lib/python2.6/sndhdr.py
file path=usr/lib/python2.6/socket.py
+dir path=usr/lib/python2.6/sqlite3
file path=usr/lib/python2.6/sqlite3/__init__.py
file path=usr/lib/python2.6/sqlite3/dbapi2.py
file path=usr/lib/python2.6/sqlite3/dump.py
@@ -940,11 +947,13 @@
file path=usr/lib/python2.6/user.py
file path=usr/lib/python2.6/uu.py
file path=usr/lib/python2.6/uuid.py
+dir path=usr/lib/python2.6/vendor-packages
file path=usr/lib/python2.6/warnings.py
file path=usr/lib/python2.6/wave.py
file path=usr/lib/python2.6/weakref.py
file path=usr/lib/python2.6/webbrowser.py pkg.depend.bypass-generate=.*
file path=usr/lib/python2.6/whichdb.py
+dir path=usr/lib/python2.6/wsgiref
file path=usr/lib/python2.6/wsgiref.egg-info
file path=usr/lib/python2.6/wsgiref/__init__.py
file path=usr/lib/python2.6/wsgiref/handlers.py
@@ -953,7 +962,9 @@
file path=usr/lib/python2.6/wsgiref/util.py
file path=usr/lib/python2.6/wsgiref/validate.py
file path=usr/lib/python2.6/xdrlib.py
+dir path=usr/lib/python2.6/xml
file path=usr/lib/python2.6/xml/__init__.py
+dir path=usr/lib/python2.6/xml/dom
file path=usr/lib/python2.6/xml/dom/NodeFilter.py
file path=usr/lib/python2.6/xml/dom/__init__.py
file path=usr/lib/python2.6/xml/dom/domreg.py
@@ -962,13 +973,16 @@
file path=usr/lib/python2.6/xml/dom/minidom.py
file path=usr/lib/python2.6/xml/dom/pulldom.py
file path=usr/lib/python2.6/xml/dom/xmlbuilder.py
+dir path=usr/lib/python2.6/xml/etree
file path=usr/lib/python2.6/xml/etree/ElementInclude.py
file path=usr/lib/python2.6/xml/etree/ElementPath.py
file path=usr/lib/python2.6/xml/etree/ElementTree.py
file path=usr/lib/python2.6/xml/etree/__init__.py
file path=usr/lib/python2.6/xml/etree/cElementTree.py
+dir path=usr/lib/python2.6/xml/parsers
file path=usr/lib/python2.6/xml/parsers/__init__.py
file path=usr/lib/python2.6/xml/parsers/expat.py
+dir path=usr/lib/python2.6/xml/sax
file path=usr/lib/python2.6/xml/sax/__init__.py
file path=usr/lib/python2.6/xml/sax/_exceptions.py
file path=usr/lib/python2.6/xml/sax/expatreader.py
@@ -978,37 +992,14 @@
file path=usr/lib/python2.6/xmllib.py
file path=usr/lib/python2.6/xmlrpclib.py
file path=usr/lib/python2.6/zipfile.py
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+link path=usr/share/man/man1/python.1 target=python2.6.1 mediator=python \
+ mediator-version=2.6
file usr/share/man/man1/python.1 path=usr/share/man/man1/python2.6.1
-hardlink path=usr/bin/isapython2.6 target=../lib/isaexec
license python26.license license=PSFv2
-link path=usr/bin/$(MACH64)/python2.6 target=isapython2.6
-
-# python2.6
-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
-
-link path=usr/bin/2to3 target=2to3-2.6 \
- mediator=python mediator-version=2.6
-link path=usr/bin/idle target=idle-2.6 \
- mediator=python mediator-version=2.6
-link path=usr/bin/pydoc target=pydoc-2.6 \
- mediator=python mediator-version=2.6
-link path=usr/bin/python target=python2.6 \
- mediator=python mediator-version=2.6
-link path=usr/bin/python-config target=python2.6-config \
- mediator=python mediator-version=2.6
-link path=usr/bin/$(MACH64)/python target=python2.6 \
- mediator=python mediator-version=2.6
-link path=usr/bin/$(MACH64)/python-config target=python2.6-config \
- mediator=python mediator-version=2.6
-link path=usr/share/man/man1/python.1 target=python2.6.1 \
- mediator=python mediator-version=2.6
-
# This optionally brings in the python tk support if tk is installed
-depend type=conditional fmri=library/python-2/tkinter-26 predicate=runtime/tk-8
+depend type=conditional fmri=library/python/tkinter-26 predicate=runtime/tk-8