--- a/components/python/python27/python-27.p5m Mon May 19 10:28:03 2014 +0100
+++ b/components/python/python27/python-27.p5m Mon May 19 07:37:20 2014 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -31,30 +31,39 @@
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/2008/514 \
- value=PSARC/2009/529 \
- value=PSARC/2011/XXX
+set name=org.opensolaris.arc-caseid value=PSARC/2008/514 value=PSARC/2009/529
# PSARC 2008/514 Python interface to dlpi(7P)
# PSARC 2009/529 Python interface to privileges(5) & rbac(5)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license python27.license license=PSFv2
-
+#file path=usr/bin/smtpd.py
+#file path=usr/bin/$(MACH64)/smtpd.py
+#
+file usr/bin/python2.7 path=usr/bin/$(MACH32)/isapython2.7
+link path=usr/bin/$(MACH32)/python2.7 target=isapython2.7
+file usr/bin/$(MACH64)/python2.7 path=usr/bin/$(MACH64)/isapython2.7
+link path=usr/bin/$(MACH64)/python target=python2.7 mediator=python \
+ mediator-version=2.7
+link path=usr/bin/$(MACH64)/python-config target=python2.7-config \
+ mediator=python mediator-version=2.7
+link path=usr/bin/$(MACH64)/python2.7 target=isapython2.7
+#
+file path=usr/bin/$(MACH64)/python2.7-config
+link path=usr/bin/2to3 target=2to3-2.7 mediator=python mediator-version=2.7
+#
#dir path=usr/lib/$(MACH64)/python2.7
#dir path=usr/lib/$(MACH64)/python2.7/config
-
+#
file usr/bin/2to3 path=usr/bin/2to3-2.7
+link path=usr/bin/idle target=idle-2.7 mediator=python mediator-version=2.7
file usr/bin/idle path=usr/bin/idle-2.7
+hardlink path=usr/bin/isapython2.7 target=../lib/isaexec
+link path=usr/bin/pydoc target=pydoc-2.7 mediator=python mediator-version=2.7
file usr/bin/pydoc path=usr/bin/pydoc-2.7
-#file path=usr/bin/smtpd.py pkg.tmp.autopyc=false
-#file path=usr/bin/$(MACH64)/smtpd.py pkg.tmp.autopyc=false
-
-file usr/bin/python2.7 path=usr/bin/$(MACH32)/isapython2.7
-file usr/bin/$(MACH64)/python2.7 path=usr/bin/$(MACH64)/isapython2.7
-
-file path=usr/bin/$(MACH64)/python2.7-config
+link path=usr/bin/python target=python2.7 mediator=python mediator-version=2.7
+link path=usr/bin/python-config target=python2.7-config mediator=python \
+ mediator-version=2.7
+link path=usr/bin/python2.7 target=$(MACH32)/isapython2.7
file path=usr/bin/python2.7-config
file path=usr/include/python2.7/Python-ast.h
file path=usr/include/python2.7/Python.h
@@ -115,9 +124,9 @@
file path=usr/include/python2.7/py_curses.h
file path=usr/include/python2.7/pyarena.h
file path=usr/include/python2.7/pycapsule.h
-file files/pyconfig.h path=usr/include/python2.7/pyconfig.h
file path=usr/include/python2.7/pyconfig-32.h
file path=usr/include/python2.7/pyconfig-64.h
+file files/pyconfig.h path=usr/include/python2.7/pyconfig.h
file path=usr/include/python2.7/pyctype.h
file path=usr/include/python2.7/pydebug.h
file path=usr/include/python2.7/pyerrors.h
@@ -150,10 +159,15 @@
file path=usr/include/python2.7/unicodeobject.h
file path=usr/include/python2.7/warnings.h
file path=usr/include/python2.7/weakrefobject.h
+link path=usr/lib/$(MACH64)/libpython2.7.so target=libpython2.7.so.1.0
file path=usr/lib/$(MACH64)/libpython2.7.so.1.0
+link path=usr/lib/$(MACH64)/libpython2.7_db.so target=libpython2.7_db.so.1.0
file path=usr/lib/$(MACH64)/libpython2.7_db.so.1.0
file $(MACH64)/llib-lpython27.ln path=usr/lib/$(MACH64)/llib-lpython2.7.ln
file path=usr/lib/$(MACH64)/pkgconfig/python-2.7.pc
+link path=usr/lib/$(MACH64)/pkgconfig/python.pc target=python-2.7.pc \
+ mediator=python mediator-version=2.7
+link path=usr/lib/libpython2.7.so target=libpython2.7.so.1.0
#file path=usr/lib/$(MACH64)/python2.7/config/Makefile
#file path=usr/lib/$(MACH64)/python2.7/config/Setup
#file path=usr/lib/$(MACH64)/python2.7/config/Setup.config
@@ -164,10 +178,13 @@
#file path=usr/lib/$(MACH64)/python2.7/config/makesetup mode=0555
#file path=usr/lib/$(MACH64)/python2.7/config/python.o
file path=usr/lib/libpython2.7.so.1.0
+link path=usr/lib/libpython2.7_db.so target=libpython2.7_db.so.1.0
file path=usr/lib/libpython2.7_db.so.1.0
file llib-lpython27 path=usr/lib/llib-lpython2.7
file $(MACH32)/llib-lpython27.ln path=usr/lib/llib-lpython2.7.ln
file path=usr/lib/pkgconfig/python-2.7.pc
+link path=usr/lib/pkgconfig/python.pc target=python-2.7.pc mediator=python \
+ mediator-version=2.7
file path=usr/lib/python2.7/BaseHTTPServer.py
file path=usr/lib/python2.7/Bastion.py
file path=usr/lib/python2.7/CGIHTTPServer.py
@@ -596,7 +613,6 @@
file path=usr/lib/python2.7/json/scanner.py
file path=usr/lib/python2.7/json/tool.py
file path=usr/lib/python2.7/keyword.py
-file path=usr/lib/python2.7/lib-dynload/Python-$(COMPONENT_VERSION)-py2.7.egg-info
file path=usr/lib/python2.7/lib-dynload/64/_bisect.so
file path=usr/lib/python2.7/lib-dynload/64/_codecs_cn.so
file path=usr/lib/python2.7/lib-dynload/64/_codecs_hk.so
@@ -662,6 +678,7 @@
file path=usr/lib/python2.7/lib-dynload/64/ucred.so
file path=usr/lib/python2.7/lib-dynload/64/unicodedata.so
file path=usr/lib/python2.7/lib-dynload/64/zlib.so
+file path=usr/lib/python2.7/lib-dynload/Python-$(COMPONENT_VERSION)-py2.7.egg-info
file path=usr/lib/python2.7/lib-dynload/_bisect.so
file path=usr/lib/python2.7/lib-dynload/_codecs_cn.so
file path=usr/lib/python2.7/lib-dynload/_codecs_hk.so
@@ -729,10 +746,10 @@
file path=usr/lib/python2.7/lib-dynload/ucred.so
file path=usr/lib/python2.7/lib-dynload/unicodedata.so
file path=usr/lib/python2.7/lib-dynload/zlib.so
+file path=usr/lib/python2.7/lib2to3/Grammar$(COMPONENT_VERSION).final.0.pickle
file path=usr/lib/python2.7/lib2to3/Grammar.txt
-file path=usr/lib/python2.7/lib2to3/Grammar$(COMPONENT_VERSION).final.0.pickle
+file path=usr/lib/python2.7/lib2to3/PatternGrammar$(COMPONENT_VERSION).final.0.pickle
file path=usr/lib/python2.7/lib2to3/PatternGrammar.txt
-file path=usr/lib/python2.7/lib2to3/PatternGrammar$(COMPONENT_VERSION).final.0.pickle
file path=usr/lib/python2.7/lib2to3/__init__.py
file path=usr/lib/python2.7/lib2to3/__main__.py
file path=usr/lib/python2.7/lib2to3/btm_matcher.py
@@ -1002,28 +1019,11 @@
file path=usr/lib/python2.7/xmllib.py
file path=usr/lib/python2.7/xmlrpclib.py
file path=usr/lib/python2.7/zipfile.py
+link path=usr/share/man/man1/python.1 target=python2.7.1 mediator=python \
+ mediator-version=2.7
file path=usr/share/man/man1/python2.7.1
-
-hardlink path=usr/bin/isapython2.7 target=../lib/isaexec
-
-link path=usr/bin/$(MACH32)/python2.7 target=isapython2.7
-link path=usr/bin/$(MACH64)/python2.7 target=isapython2.7
-link path=usr/bin/python2.7 target=$(MACH32)/isapython2.7
-link path=usr/lib/$(MACH64)/libpython2.7.so target=libpython2.7.so.1.0
-link path=usr/lib/$(MACH64)/libpython2.7_db.so target=libpython2.7_db.so.1.0
-link path=usr/lib/libpython2.7.so target=libpython2.7.so.1.0
-link path=usr/lib/libpython2.7_db.so target=libpython2.7_db.so.1.0
-
-link path=usr/bin/2to3 target=2to3-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/idle target=idle-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/pydoc target=pydoc-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/python target=python2.7 mediator=python mediator-version=2.7
-link path=usr/bin/python-config target=python2.7-config mediator=python mediator-version=2.7
-link path=usr/bin/$(MACH64)/python target=python2.7 mediator=python mediator-version=2.7
-link path=usr/bin/$(MACH64)/python-config target=python2.7-config mediator=python mediator-version=2.7
-link path=usr/lib/pkgconfig/python.pc target=python-2.7.pc mediator=python mediator-version=2.7
-link path=usr/lib/$(MACH64)/pkgconfig/python.pc target=python-2.7.pc mediator=python mediator-version=2.7
-link path=usr/share/man/man1/python.1 target=python2.7.1 mediator=python mediator-version=2.7
+#
+license python27.license license=PSFv2
# This optionally brings in the python tk support if tk is installed
depend type=conditional fmri=library/python/tkinter-27 predicate=runtime/tk-8