PSARC 2014/009 Python pkg(5) name-space update
18141589 Userland instance of s|/library/python-2/|/library/python/|g
--- a/components/fetchmail/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/fetchmail/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,5 @@
library/python-2/tkinter-26
+library/python/tkinter-26
library/security/openssl
runtime/python-26
service/security/kerberos-5
--- a/components/lcms/lcms-py26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/lcms/lcms-py26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,28 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
- value=pkg:/library/python-2/lcms-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python 2.6 bindings for the Little Color Management System"
-set name=com.oracle.info.description value="the Python 2.6 bindings for the Little Color Management System"
+ value=pkg:/library/python/lcms-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Python 2.6 bindings for the Little Color Management System"
+set name=com.oracle.info.description \
+ value="the Python 2.6 bindings for the Little Color Management System"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
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/071
+set name=org.opensolaris.arc-caseid value=PSARC/2008/071
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/64
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/64
#
file path=usr/lib/python2.6/vendor-packages/64/_lcms.so
file path=usr/lib/python2.6/vendor-packages/_lcms.so
@@ -46,6 +47,9 @@
#
license lcms.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+ pkg.debug.depend.path=usr/bin
--- a/components/lcms/lcms-py27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/lcms/lcms-py27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,28 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
- value=pkg:/library/python-2/lcms-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Python 2.7 bindings for the Little Color Management System"
-set name=com.oracle.info.description value="the Python 2.7 bindings for the Little Color Management System"
+ value=pkg:/library/python/lcms-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Python 2.7 bindings for the Little Color Management System"
+set name=com.oracle.info.description \
+ value="the Python 2.7 bindings for the Little Color Management System"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
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/071
+set name=org.opensolaris.arc-caseid value=PSARC/2008/071
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/64
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
#
file path=usr/lib/python2.7/vendor-packages/64/_lcms.so
file path=usr/lib/python2.7/vendor-packages/_lcms.so
@@ -46,6 +47,9 @@
#
license lcms.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+ pkg.debug.depend.path=usr/bin
--- a/components/lcms/lcms.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/lcms/lcms.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,38 +18,25 @@
#
# 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>
set name=pkg.fmri \
value=pkg:/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="The Little Color Management System"
set name=pkg.description \
value="A small-footprint color management engine, with special focus on accuracy and performance"
-set name=pkg.summary value="The Little Color Management System"
set name=com.oracle.info.description value="the Little Color Management System"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:System/Libraries
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/071
+set name=org.opensolaris.arc-caseid value=PSARC/2008/071
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/lcms
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/lcms
-dir path=usr/share/doc/lcms/html
-dir path=usr/share/man
-dir path=usr/share/man/man1
+dir path=usr
+dir path=usr/bin
#
file path=usr/bin/icc2ps
file path=usr/bin/icclink
@@ -58,15 +45,32 @@
file path=usr/bin/tiffdiff
file path=usr/bin/tifficc
file path=usr/bin/wtpt
+dir path=usr/include
+dir path=usr/include/lcms
file path=usr/include/lcms/icc34.h
file path=usr/include/lcms/lcms.h
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+#
+link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
file path=usr/lib/$(MACH64)/liblcms.so.1.0.19
file path=usr/lib/$(MACH64)/llib-llcms.ln
+dir path=usr/lib/$(MACH64)/pkgconfig
file path=usr/lib/$(MACH64)/pkgconfig/lcms.pc
+link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
+link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
file path=usr/lib/liblcms.so.1.0.19
file path=usr/lib/llib-llcms
file path=usr/lib/llib-llcms.ln
+dir path=usr/lib/pkgconfig
file path=usr/lib/pkgconfig/lcms.pc
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/lcms
+dir path=usr/share/doc/lcms/html
+dir path=usr/share/man
+dir path=usr/share/man/man1
file path=usr/share/man/man1/icc2ps.1
file path=usr/share/man/man1/icclink.1
file samples/icctrans.1 path=usr/share/man/man1/icctrans.1
@@ -75,16 +79,9 @@
file path=usr/share/man/man1/wtpt.1
#
license lcms.license license=MIT
-#
-link path=usr/lib/$(MACH64)/liblcms.so target=liblcms.so.1.0.19
-link path=usr/lib/$(MACH64)/liblcms.so.1 target=liblcms.so.1.0.19
-link path=usr/lib/liblcms.so target=liblcms.so.1.0.19
-link path=usr/lib/liblcms.so.1 target=liblcms.so.1.0.19
-
-depend fmri=library/python-2/lcms-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python-2/lcms-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+depend type=conditional \
+ fmri=library/python/lcms-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/lcms-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lcms-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lcms-27
--- a/components/libxslt/libxsl-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/libxslt/libxsl-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,31 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/libxsl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/libxsl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XSLT library - Python 2.6 bindings"
-set name=com.oracle.info.description value="Python 2.6 bindings for the XSLT library"
+set name=com.oracle.info.description \
+ value="Python 2.6 bindings for the XSLT library"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2002/244
+set name=org.opensolaris.arc-caseid value=PSARC/2002/244
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/64
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/64
file path=usr/lib/python2.6/vendor-packages/64/libxsltmod.so
file path=usr/lib/python2.6/vendor-packages/libxslt.py
file path=usr/lib/python2.6/vendor-packages/libxsltmod.so
license xsl.license license=SUNWlxsl-python26.copyright
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/libxslt/libxsl-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/libxslt/libxsl-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,27 +18,31 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/libxsl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/libxsl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The XSLT library - Python 2.7 bindings"
-set name=com.oracle.info.description value="Python 2.7 bindings for the XSLT library"
+set name=com.oracle.info.description \
+ value="Python 2.7 bindings for the XSLT library"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2002/244
+set name=org.opensolaris.arc-caseid value=PSARC/2002/244
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/64
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
file path=usr/lib/python2.7/vendor-packages/64/libxsltmod.so
file path=usr/lib/python2.7/vendor-packages/libxslt.py
file path=usr/lib/python2.7/vendor-packages/libxsltmod.so
license xsl.license license=SUNWlxsl-python26.copyright
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/libxslt/libxslt.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/libxslt/libxslt.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,36 +31,18 @@
value=org.opensolaris.category.2008:System/Libraries
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/2002/244
+set name=org.opensolaris.arc-caseid value=PSARC/2002/244
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/libexslt
-dir path=usr/include/libxslt
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/aclocal
-dir path=usr/share/lib
-dir path=usr/share/lib/xslt
-dir path=usr/share/lib/xslt/doc
-dir path=usr/share/lib/xslt/doc/html
-dir path=usr/share/lib/xslt/doc/html/EXSLT
-dir path=usr/share/lib/xslt/doc/html/html
-dir path=usr/share/lib/xslt/doc/html/tutorial
-dir path=usr/share/lib/xslt/doc/html/tutorial2
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
+dir path=usr
+dir path=usr/bin
file path=usr/bin/xslt-config facet.devel=true
file path=usr/bin/xsltproc
+dir path=usr/include
+dir path=usr/include/libexslt
file path=usr/include/libexslt/exslt.h
file path=usr/include/libexslt/exsltconfig.h
file path=usr/include/libexslt/exsltexports.h
+dir path=usr/include/libxslt
file path=usr/include/libxslt/attributes.h
file path=usr/include/libxslt/documents.h
file path=usr/include/libxslt/extensions.h
@@ -82,21 +64,35 @@
file path=usr/include/libxslt/xsltexports.h
file path=usr/include/libxslt/xsltlocale.h
file path=usr/include/libxslt/xsltutils.h
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0
file path=usr/lib/$(MACH64)/libexslt.so.0
+link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1
file path=usr/lib/$(MACH64)/libxslt.so.1
file path=usr/lib/$(MACH64)/llib-lexslt.ln
file path=usr/lib/$(MACH64)/llib-lxslt.ln
+dir path=usr/lib/$(MACH64)/pkgconfig
file path=usr/lib/$(MACH64)/pkgconfig/libexslt.pc
file path=usr/lib/$(MACH64)/pkgconfig/libxslt.pc
+link path=usr/lib/libexslt.so target=./libexslt.so.0
file path=usr/lib/libexslt.so.0
+link path=usr/lib/libxslt.so target=./libxslt.so.1
file path=usr/lib/libxslt.so.1
file llib-lexslt path=usr/lib/llib-lexslt
file path=usr/lib/llib-lexslt.ln
file llib-lexslt path=usr/lib/llib-lxslt
file path=usr/lib/llib-lxslt.ln
+dir path=usr/lib/pkgconfig
file path=usr/lib/pkgconfig/libexslt.pc
file path=usr/lib/pkgconfig/libxslt.pc
+dir path=usr/share
+dir path=usr/share/aclocal
file path=usr/share/aclocal/libxslt.m4
+dir path=usr/share/lib
+dir path=usr/share/lib/xslt
+dir path=usr/share/lib/xslt/doc
+dir path=usr/share/lib/xslt/doc/html
file path=usr/share/lib/xslt/doc/html/API.html
file path=usr/share/lib/xslt/doc/html/APIchunk0.html
file path=usr/share/lib/xslt/doc/html/APIchunk1.html
@@ -116,6 +112,7 @@
file path=usr/share/lib/xslt/doc/html/APIfiles.html
file path=usr/share/lib/xslt/doc/html/APIfunctions.html
file path=usr/share/lib/xslt/doc/html/APIsymbols.html
+dir path=usr/share/lib/xslt/doc/html/EXSLT
file path=usr/share/lib/xslt/doc/html/EXSLT/APIchunk0.html
file path=usr/share/lib/xslt/doc/html/EXSLT/APIconstructors.html
file path=usr/share/lib/xslt/doc/html/EXSLT/APIfiles.html
@@ -139,6 +136,7 @@
file path=usr/share/lib/xslt/doc/html/downloads.html
file path=usr/share/lib/xslt/doc/html/extensions.html
file path=usr/share/lib/xslt/doc/html/help.html
+dir path=usr/share/lib/xslt/doc/html/html
file path=usr/share/lib/xslt/doc/html/html/book1.html
file path=usr/share/lib/xslt/doc/html/html/home.png
file path=usr/share/lib/xslt/doc/html/html/index.html
@@ -177,30 +175,29 @@
file path=usr/share/lib/xslt/doc/html/smallfootonly.gif
file path=usr/share/lib/xslt/doc/html/stylesheet.gif
file path=usr/share/lib/xslt/doc/html/templates.gif
+dir path=usr/share/lib/xslt/doc/html/tutorial
file path=usr/share/lib/xslt/doc/html/tutorial/libxslt_tutorial.c
file path=usr/share/lib/xslt/doc/html/tutorial/libxslttutorial.html
file path=usr/share/lib/xslt/doc/html/tutorial/libxslttutorial.xml
+dir path=usr/share/lib/xslt/doc/html/tutorial2
file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.c
file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.html
file path=usr/share/lib/xslt/doc/html/tutorial2/libxslt_pipes.xml
file path=usr/share/lib/xslt/doc/html/xslt.html
file path=usr/share/lib/xslt/doc/html/xsltproc.html
file path=usr/share/lib/xslt/doc/html/xsltproc2.html
+dir path=usr/share/man
+dir path=usr/share/man/man1
file xslt-config.1 path=usr/share/man/man1/xslt-config.1 facet.devel=all
file path=usr/share/man/man1/xsltproc.1
+dir path=usr/share/man/man3
file path=usr/share/man/man3/libexslt.3
file path=usr/share/man/man3/libxslt.3
legacy pkg=SUNWlxsl desc="The XSLT library" name="The XSLT library"
license xsl.license license=SUNWlxsl.copyright
-link path=usr/lib/$(MACH64)/libexslt.so target=libexslt.so.0
-link path=usr/lib/$(MACH64)/libxslt.so target=libxslt.so.1
-link path=usr/lib/libexslt.so target=./libexslt.so.0
-link path=usr/lib/libxslt.so target=./libxslt.so.1
-
-depend fmri=library/python-2/libxsl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python-2/libxsl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+depend type=conditional \
+ fmri=library/python/libxsl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/libxsl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/libxsl-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/libxslt/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/libxsl-27
--- a/components/logilab-astng/logilab-astng-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-astng/logilab-astng-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,44 +18,39 @@
#
# 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>
-
set name=pkg.fmri \
- value=pkg:/library/python-2/logilab-astng-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/logilab-astng-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="logilab-astng - Python Abstract Syntax Tree New Generation"
set name=pkg.description \
value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=pkg.summary \
- value="logilab-astng - Python Abstract Syntax Tree New Generation"
set name=com.oracle.info.description value="the logilab-astng Python 2.6 module"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/299
+set name=org.opensolaris.arc-caseid value=LSARC/2009/299
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/logilab
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng
-dir path=usr/lib/python2.6/vendor-packages/logilab/astng/brain
-dir \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/logilab
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng
# This file is provided by the logilab-common package
-#file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py \
-# pkg.tmp.autopyc=false
+#file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py # pkg.tmp.autopyc=false
file path=usr/lib/python2.6/vendor-packages/logilab/astng/__init__.py
file path=usr/lib/python2.6/vendor-packages/logilab/astng/__pkginfo__.py
file path=usr/lib/python2.6/vendor-packages/logilab/astng/as_string.py
file path=usr/lib/python2.6/vendor-packages/logilab/astng/bases.py
-file path=usr/lib/python2.6/vendor-packages/logilab/astng/brain/py2stdlib.py pkg.tmp.autopyc=false
+dir path=usr/lib/python2.6/vendor-packages/logilab/astng/brain
+file path=usr/lib/python2.6/vendor-packages/logilab/astng/brain/py2stdlib.py \
+ pkg.tmp.autopyc=false
file path=usr/lib/python2.6/vendor-packages/logilab/astng/builder.py
file path=usr/lib/python2.6/vendor-packages/logilab/astng/exceptions.py
file path=usr/lib/python2.6/vendor-packages/logilab/astng/inference.py
@@ -69,30 +64,27 @@
file path=usr/lib/python2.6/vendor-packages/logilab/astng/rebuilder.py
file path=usr/lib/python2.6/vendor-packages/logilab/astng/scoped_nodes.py
file path=usr/lib/python2.6/vendor-packages/logilab/astng/utils.py
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6-nspkg.pth
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
-
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6-nspkg.pth
+dir path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
license logilab-astng.license license=LGPLv2.1,GPLv2
-# force a dependency on logilab-common version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+ pkg.debug.depend.path=usr/bin
# force a dependency on the logilab-astng package
-depend fmri=library/python-2/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require \
+ fmri=library/python/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-common version 0.58.2
+depend type=require fmri=library/python/[email protected]
--- a/components/logilab-astng/logilab-astng-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-astng/logilab-astng-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,57 +18,39 @@
#
# 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>
-
set name=pkg.fmri \
- value=pkg:/library/python-2/logilab-astng-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/logilab-astng-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="logilab-astng - Python Abstract Syntax Tree New Generation"
set name=pkg.description \
value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=pkg.summary \
- value="logilab-astng - Python Abstract Syntax Tree New Generation"
set name=com.oracle.info.description value="the logilab-astng Python 2.7 module"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/299
+set name=org.opensolaris.arc-caseid value=LSARC/2009/299
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/logilab
-dir path=usr/lib/python2.7/vendor-packages/logilab/astng
-dir path=usr/lib/python2.7/vendor-packages/logilab/astng/brain
-dir path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info
-
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7-nspkg.pth
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/logilab
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng
# This file is provided by the logilab-common package
#file path=usr/lib/python2.7/vendor-packages/logilab/__init__.py pkg.tmp.autopyc=false
file path=usr/lib/python2.7/vendor-packages/logilab/astng/__init__.py
file path=usr/lib/python2.7/vendor-packages/logilab/astng/__pkginfo__.py
file path=usr/lib/python2.7/vendor-packages/logilab/astng/as_string.py
file path=usr/lib/python2.7/vendor-packages/logilab/astng/bases.py
-file path=usr/lib/python2.7/vendor-packages/logilab/astng/brain/py2stdlib.py pkg.tmp.autopyc=false
+dir path=usr/lib/python2.7/vendor-packages/logilab/astng/brain
+file path=usr/lib/python2.7/vendor-packages/logilab/astng/brain/py2stdlib.py \
+ pkg.tmp.autopyc=false
file path=usr/lib/python2.7/vendor-packages/logilab/astng/builder.py
file path=usr/lib/python2.7/vendor-packages/logilab/astng/exceptions.py
file path=usr/lib/python2.7/vendor-packages/logilab/astng/inference.py
@@ -82,16 +64,27 @@
file path=usr/lib/python2.7/vendor-packages/logilab/astng/rebuilder.py
file path=usr/lib/python2.7/vendor-packages/logilab/astng/scoped_nodes.py
file path=usr/lib/python2.7/vendor-packages/logilab/astng/utils.py
-
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7-nspkg.pth
+dir path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_astng-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
license logilab-astng.license license=LGPLv2.1,GPLv2
-# force a dependency on logilab-common version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+ pkg.debug.depend.path=usr/bin
# force a dependency on the logilab-astng package
-depend fmri=library/python-2/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require \
+ fmri=library/python/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-common version 0.58.2
+depend type=require fmri=library/python/[email protected]
--- a/components/logilab-astng/logilab-astng.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-astng/logilab-astng.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,36 +18,37 @@
#
# 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>
set name=pkg.fmri \
- value=pkg:/library/python-2/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="logilab-astng - Python Abstract Syntax Tree New Generation"
set name=pkg.description \
value="logilab-astng provides a common base representation of python source code for projects such as pylint."
-set name=pkg.summary \
- value="logilab-astng - Python Abstract Syntax Tree New Generation"
set name=com.oracle.info.description value="the logilab-astng Python module"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/299
+set name=org.opensolaris.arc-caseid value=LSARC/2009/299
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
+dir path=usr
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man3
file logilab-astng.3 path=usr/share/man/man3/logilab-astng.3
license logilab-astng.license license=LGPLv2.1,GPLv2
+depend type=conditional \
+ fmri=library/python/logilab-astng-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/logilab-astng-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
-depend fmri=library/python-2/logilab-astng-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python-2/logilab-astng-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-astng-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-astng-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-astng/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-astng
--- a/components/logilab-common/logilab-common-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-common/logilab-common-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,25 +18,25 @@
#
# 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>
set name=pkg.fmri \
- value=pkg:/library/python-2/logilab-common-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/logilab-common-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="common python libraries for logilab applications"
set name=pkg.description \
value="Modules providing low level functionality shared among various python projects."
-set name=pkg.summary value="common python libraries for logilab applications"
-set name=com.oracle.info.description value="the logilab-common Python 2.6 module"
+set name=com.oracle.info.description \
+ value="the logilab-common Python 2.6 module"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/298
+set name=org.opensolaris.arc-caseid value=LSARC/2009/298
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+link path=usr/bin/pytest target=pytest-2.6 mediator=python mediator-version=2.6
file path=usr/bin/pytest-2.6
file path=usr/lib/python2.6/vendor-packages/logilab/__init__.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/__init__.py
@@ -76,52 +76,40 @@
file path=usr/lib/python2.6/vendor-packages/logilab/common/textutils.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/tree.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/umessage.py
-file \
- path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.py
-file \
- path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.py
-file \
- path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/__init__.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/docbook_writer.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/html_writer.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/nodes.py
-file \
- path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.py
+file path=usr/lib/python2.6/vendor-packages/logilab/common/ureports/text_writer.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/urllib2ext.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/vcgutils.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/visitor.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/xmlrpcutils.py
file path=usr/lib/python2.6/vendor-packages/logilab/common/xmlutils.py
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6-nspkg.pth
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
-file \
- path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6-nspkg.pth
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/namespace_packages.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file path=usr/lib/python2.6/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+license logilab-common.license license=LGPLv2.1,GPLv2
-link path=usr/bin/pytest target=pytest-2.6 \
- mediator=python mediator-version=2.6
-license logilab-common.license license=LGPLv2.1,GPLv2
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
+# force a dependency on the Python 2.6 runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+ pkg.debug.depend.path=usr/bin
# pkgdepend should have picked up the dependency on /library/python-2/pyorbit-26;
# this explicit depend action can be removed if pkgdepend is fixed later
-depend fmri=__TBD \
+depend type=require fmri=__TBD \
pkg.debug.depend.file=usr/lib/python2.6/vendor-packages/CORBA.py \
- pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py \
- type=require
-
-# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
- pkg.debug.depend.path=usr/bin type=require
+ pkg.debug.reason=usr/lib/python2.6/vendor-packages/logilab/common/corbautils.py
# force a dependency on the logilab-common package
-depend fmri=library/python-2/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
+depend type=require \
+ fmri=library/python/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/logilab-common/logilab-common-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-common/logilab-common-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,37 +18,25 @@
#
# 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>
set name=pkg.fmri \
- value=pkg:/library/python-2/logilab-common-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/logilab-common-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="common python libraries for logilab applications"
set name=pkg.description \
value="Modules providing low level functionality shared among various python projects."
-set name=pkg.summary value="common python libraries for logilab applications"
-set name=com.oracle.info.description value="the logilab-common Python 2.7 module"
+set name=com.oracle.info.description \
+ value="the logilab-common Python 2.7 module"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/298
+set name=org.opensolaris.arc-caseid value=LSARC/2009/298
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7-nspkg.pth
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
-file \
- path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+link path=usr/bin/pytest target=pytest-2.7 mediator=python mediator-version=2.7
file path=usr/bin/pytest-2.7
file path=usr/lib/python2.7/vendor-packages/logilab/__init__.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/__init__.py
@@ -88,39 +76,38 @@
file path=usr/lib/python2.7/vendor-packages/logilab/common/textutils.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/tree.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/umessage.py
-file \
- path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/__init__.py
-file \
- path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/docbook_writer.py
-file \
- path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/html_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/__init__.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/docbook_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/html_writer.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/nodes.py
-file \
- path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/text_writer.py
+file path=usr/lib/python2.7/vendor-packages/logilab/common/ureports/text_writer.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/urllib2ext.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/vcgutils.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/visitor.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/xmlrpcutils.py
file path=usr/lib/python2.7/vendor-packages/logilab/common/xmlutils.py
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7-nspkg.pth
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/namespace_packages.txt
+file path=usr/lib/python2.7/vendor-packages/logilab_common-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+license logilab-common.license license=LGPLv2.1,GPLv2
-link path=usr/bin/pytest target=pytest-2.7 \
- mediator=python mediator-version=2.7
-license logilab-common.license license=LGPLv2.1,GPLv2
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
# This is commented out until there is a 2.7 version available.
-# pkgdepend should have picked up the dependency on
+# pkgdepend should have picked up the dependency on
# /library/python-2/pyorbit-27
-#depend fmri=__TBD \
-# pkg.debug.depend.file=usr/lib/python2.7/vendor-packages/CORBA.py \
-# pkg.debug.reason=usr/lib/python2.7/vendor-packages/logilab/common/corbautils.py \
-# type=require
+#depend fmri=__TBD # pkg.debug.depend.file=usr/lib/python2.7/vendor-packages/CORBA.py # pkg.debug.reason=usr/lib/python2.7/vendor-packages/logilab/common/corbautils.py # type=require
# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+ pkg.debug.depend.path=usr/bin
# force a dependency on the logilab-common package
-depend fmri=library/python-2/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
+depend type=require \
+ fmri=library/python/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/logilab-common/logilab-common.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/logilab-common/logilab-common.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,35 +18,36 @@
#
# 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>
set name=pkg.fmri \
- value=pkg:/library/python-2/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/logilab-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="common python libraries for logilab applications"
set name=pkg.description \
value="Modules providing low level functionality shared among various python projects."
-set name=pkg.summary value="common python libraries for logilab applications"
set name=com.oracle.info.description value="the logilab-common Python module"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2009/298
+set name=org.opensolaris.arc-caseid value=LSARC/2009/298
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
+dir path=usr
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man3
file logilab-common.3 path=usr/share/man/man3/logilab-common.3
license logilab-common.license license=LGPLv2.1,GPLv2
+depend type=conditional \
+ fmri=library/python/logilab-common-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/logilab-common-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
-depend fmri=library/python-2/logilab-common-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python-2/logilab-common-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-common-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-common-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/logilab-common/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/logilab-common
--- a/components/net-snmp/net-snmp-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/net-snmp/net-snmp-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,38 +18,38 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/net-snmp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/net-snmp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Net-SNMP - Python 2.6 bindings"
set name=com.oracle.info.description value="Python 2.6 bindings for Net-SNMP"
+set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=LSARC/2008/355
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=com.oracle.info.tpno value=$(TPNO)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/netsnmp
-dir path=usr/lib/python2.6/vendor-packages/netsnmp/tests
-dir path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/netsnmp
file path=usr/lib/python2.6/vendor-packages/netsnmp/__init__.py
file path=usr/lib/python2.6/vendor-packages/netsnmp/client.py
file path=usr/lib/python2.6/vendor-packages/netsnmp/client_intf.so
+dir path=usr/lib/python2.6/vendor-packages/netsnmp/tests
file path=usr/lib/python2.6/vendor-packages/netsnmp/tests/__init__.py
file path=usr/lib/python2.6/vendor-packages/netsnmp/tests/test.py
-file \
- path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/top_level.txt
+dir path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/netsnmp_python-1.0a1-py2.6.egg-info/top_level.txt
license COPYING license="BSD, BSD-like"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/net-snmp/net-snmp-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/net-snmp/net-snmp-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,38 +18,38 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/net-snmp-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/net-snmp-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Net-SNMP - Python 2.7 bindings"
set name=com.oracle.info.description value="Python 2.7 bindings for Net-SNMP"
+set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=LSARC/2008/355
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=com.oracle.info.tpno value=$(TPNO)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/netsnmp
-dir path=usr/lib/python2.7/vendor-packages/netsnmp/tests
-dir path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/netsnmp
file path=usr/lib/python2.7/vendor-packages/netsnmp/__init__.py
file path=usr/lib/python2.7/vendor-packages/netsnmp/client.py
file path=usr/lib/python2.7/vendor-packages/netsnmp/client_intf.so
+dir path=usr/lib/python2.7/vendor-packages/netsnmp/tests
file path=usr/lib/python2.7/vendor-packages/netsnmp/tests/__init__.py
file path=usr/lib/python2.7/vendor-packages/netsnmp/tests/test.py
-file \
- path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/top_level.txt
+dir path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/netsnmp_python-1.0a1-py2.7.egg-info/top_level.txt
license COPYING license="BSD, BSD-like"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/net-snmp/net-snmp-base.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/net-snmp/net-snmp-base.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,158 +18,181 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
-
-set name=pkg.fmri value=pkg:/system/management/snmp/net-snmp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/system/management/snmp/net-snmp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Net-SNMP Agent files and libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=com.oracle.info.description value="the Net-SNMP agent files and libraries"
-set name=info.classification value="org.opensolaris.category.2008:System/Enterprise Management"
-
-set name=org.opensolaris.arc-caseid \
- value=LSARC/2008/355
+set name=com.oracle.info.description \
+ value="the Net-SNMP agent files and libraries"
set name=com.oracle.info.tpno value=$(TPNO)
-
-license COPYING license="BSD, BSD-like"
-
-dir path=etc
-dir path=etc/net-snmp
-dir path=etc/net-snmp/snmp
-dir path=etc/net-snmp/snmp/mib2c-data
-dir path=etc/net-snmp/snmp/mibs
-dir path=etc/net-snmp/snmp/snmpconf-data
-dir path=etc/net-snmp/snmp/snmpconf-data/snmp-data
-dir path=etc/net-snmp/snmp/snmpconf-data/snmpd-data
-dir path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest group=sys
-dir path=lib/svc/manifest/application group=sys
-dir path=lib/svc/manifest/application/management group=sys
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/net-snmp
-dir path=usr/include/net-snmp/agent
-dir path=usr/include/net-snmp/library
-dir path=usr/include/net-snmp/machine
-dir path=usr/include/net-snmp/snmplib
-dir path=usr/include/net-snmp/system
-dir path=usr/include/ucd-snmp
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/net-snmp
-dir path=usr/perl5
-dir path=usr/perl5/$(PERL_VERSION)
-dir path=usr/perl5/$(PERL_VERSION)/man
-dir path=usr/perl5/$(PERL_VERSION)/man/man3
-dir path=usr/perl5/vendor_perl
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP
-dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent
-dir path=usr/sbin
-dir path=usr/sbin/$(MACH64)
-dir path=usr/sbin/$(MACH32)
-file local/mib2c-conf.d/default-mfd-top.m2c path=etc/net-snmp/snmp/mib2c-data/default-mfd-top.m2c
-file local/mib2c-conf.d/details-enums.m2i path=etc/net-snmp/snmp/mib2c-data/details-enums.m2i
-file local/mib2c-conf.d/details-node.m2i path=etc/net-snmp/snmp/mib2c-data/details-node.m2i
-file local/mib2c-conf.d/details-table.m2i path=etc/net-snmp/snmp/mib2c-data/details-table.m2i
-file local/mib2c-conf.d/generic-ctx-copy.m2i path=etc/net-snmp/snmp/mib2c-data/generic-ctx-copy.m2i
-file local/mib2c-conf.d/generic-ctx-get.m2i path=etc/net-snmp/snmp/mib2c-data/generic-ctx-get.m2i
-file local/mib2c-conf.d/generic-ctx-set.m2i path=etc/net-snmp/snmp/mib2c-data/generic-ctx-set.m2i
-file local/mib2c-conf.d/generic-data-allocate.m2i path=etc/net-snmp/snmp/mib2c-data/generic-data-allocate.m2i
-file local/mib2c-conf.d/generic-data-context.m2i path=etc/net-snmp/snmp/mib2c-data/generic-data-context.m2i
-file local/mib2c-conf.d/generic-get-char.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-char.m2i
-file local/mib2c-conf.d/generic-get-decl-bot.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-decl-bot.m2i
-file local/mib2c-conf.d/generic-get-decl.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-decl.m2i
-file local/mib2c-conf.d/generic-get-long.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-long.m2i
-file local/mib2c-conf.d/generic-get-oid.m2i path=etc/net-snmp/snmp/mib2c-data/generic-get-oid.m2i
-file local/mib2c-conf.d/generic-header-bottom.m2i path=etc/net-snmp/snmp/mib2c-data/generic-header-bottom.m2i
-file local/mib2c-conf.d/generic-header-top.m2i path=etc/net-snmp/snmp/mib2c-data/generic-header-top.m2i
-file local/mib2c-conf.d/generic-source-includes.m2i path=etc/net-snmp/snmp/mib2c-data/generic-source-includes.m2i
-file local/mib2c-conf.d/generic-table-constants.m2c path=etc/net-snmp/snmp/mib2c-data/generic-table-constants.m2c
-file local/mib2c-conf.d/generic-table-enums.m2c path=etc/net-snmp/snmp/mib2c-data/generic-table-enums.m2c
-file local/mib2c-conf.d/generic-table-indexes-from-oid.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-from-oid.m2i
-file local/mib2c-conf.d/generic-table-indexes-set.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-set.m2i
-file local/mib2c-conf.d/generic-table-indexes-to-oid.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-to-oid.m2i
-file local/mib2c-conf.d/generic-table-indexes-varbind-setup.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-varbind-setup.m2i
-file local/mib2c-conf.d/generic-table-indexes.m2i path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes.m2i
-file local/mib2c-conf.d/generic-table-oids.m2c path=etc/net-snmp/snmp/mib2c-data/generic-table-oids.m2c
-file local/mib2c-conf.d/generic-value-map-func.m2i path=etc/net-snmp/snmp/mib2c-data/generic-value-map-func.m2i
-file local/mib2c-conf.d/generic-value-map-reverse.m2i path=etc/net-snmp/snmp/mib2c-data/generic-value-map-reverse.m2i
-file local/mib2c-conf.d/generic-value-map.m2i path=etc/net-snmp/snmp/mib2c-data/generic-value-map.m2i
-file local/mib2c-conf.d/m2c-internal-warning.m2i path=etc/net-snmp/snmp/mib2c-data/m2c-internal-warning.m2i
-file local/mib2c-conf.d/m2c_setup_enum.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_setup_enum.m2i
-file local/mib2c-conf.d/m2c_setup_node.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_setup_node.m2i
-file local/mib2c-conf.d/m2c_setup_table.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_setup_table.m2i
-file local/mib2c-conf.d/m2c_table_save_defaults.m2i path=etc/net-snmp/snmp/mib2c-data/m2c_table_save_defaults.m2i
-file local/mib2c-conf.d/mfd-access-container-cached-defines.m2i path=etc/net-snmp/snmp/mib2c-data/mfd-access-container-cached-defines.m2i
-file local/mib2c-conf.d/mfd-access-unsorted-external-defines.m2i path=etc/net-snmp/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i
-file local/mib2c-conf.d/mfd-data-access.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-data-access.m2c
-file local/mib2c-conf.d/mfd-data-get.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-data-get.m2c
-file local/mib2c-conf.d/mfd-data-set.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-data-set.m2c
-file local/mib2c-conf.d/mfd-doxygen.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-doxygen.m2c
-file local/mib2c-conf.d/mfd-interactive-setup.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-interactive-setup.m2c
-file local/mib2c-conf.d/mfd-interface.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-interface.m2c
-file local/mib2c-conf.d/mfd-makefile.m2m path=etc/net-snmp/snmp/mib2c-data/mfd-makefile.m2m
-file local/mib2c-conf.d/mfd-persistence.m2i path=etc/net-snmp/snmp/mib2c-data/mfd-persistence.m2i
-file local/mib2c-conf.d/mfd-readme.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-readme.m2c
-file local/mib2c-conf.d/mfd-top.m2c path=etc/net-snmp/snmp/mib2c-data/mfd-top.m2c
-file local/mib2c-conf.d/node-get.m2i path=etc/net-snmp/snmp/mib2c-data/node-get.m2i
-file local/mib2c-conf.d/node-set.m2i path=etc/net-snmp/snmp/mib2c-data/node-set.m2i
-file local/mib2c-conf.d/node-storage.m2i path=etc/net-snmp/snmp/mib2c-data/node-storage.m2i
-file local/mib2c-conf.d/node-validate.m2i path=etc/net-snmp/snmp/mib2c-data/node-validate.m2i
-file local/mib2c-conf.d/node-varbind-validate.m2i path=etc/net-snmp/snmp/mib2c-data/node-varbind-validate.m2i
-file local/mib2c-conf.d/parent-dependencies.m2i path=etc/net-snmp/snmp/mib2c-data/parent-dependencies.m2i
-file local/mib2c-conf.d/parent-set.m2i path=etc/net-snmp/snmp/mib2c-data/parent-set.m2i
-file local/mib2c-conf.d/subagent.m2c path=etc/net-snmp/snmp/mib2c-data/subagent.m2c
-file local/mib2c-conf.d/syntax-COUNTER64-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-COUNTER64-get.m2i
-file local/mib2c-conf.d/syntax-DateAndTime-get.m2d path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2d
-file local/mib2c-conf.d/syntax-DateAndTime-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2i
-file local/mib2c-conf.d/syntax-DateAndTime-readme.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-readme.m2i
-file local/mib2c-conf.d/syntax-InetAddress-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-get.m2i
-file local/mib2c-conf.d/syntax-InetAddress-set.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-set.m2i
-file local/mib2c-conf.d/syntax-InetAddressType-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-get.m2i
-file local/mib2c-conf.d/syntax-InetAddressType-set.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-set.m2i
-file local/mib2c-conf.d/syntax-RowStatus-dependencies.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-dependencies.m2i
-file local/mib2c-conf.d/syntax-RowStatus-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-get.m2i
-file local/mib2c-conf.d/syntax-RowStatus-varbind-validate.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-varbind-validate.m2i
-file local/mib2c-conf.d/syntax-StorageType-dependencies.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-StorageType-dependencies.m2i
-file local/mib2c-conf.d/syntax-TestAndIncr-get.m2i path=etc/net-snmp/snmp/mib2c-data/syntax-TestAndIncr-get.m2i
-file local/mib2c.access_functions.conf path=etc/net-snmp/snmp/mib2c.access_functions.conf
+set name=info.classification \
+ value="org.opensolaris.category.2008:System/Enterprise Management"
+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=LSARC/2008/355
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=etc
+dir path=etc/net-snmp
+dir path=etc/net-snmp/snmp
+dir path=etc/net-snmp/snmp/mib2c-data
+file local/mib2c-conf.d/default-mfd-top.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/default-mfd-top.m2c
+file local/mib2c-conf.d/details-enums.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/details-enums.m2i
+file local/mib2c-conf.d/details-node.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/details-node.m2i
+file local/mib2c-conf.d/details-table.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/details-table.m2i
+file local/mib2c-conf.d/generic-ctx-copy.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-ctx-copy.m2i
+file local/mib2c-conf.d/generic-ctx-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-ctx-get.m2i
+file local/mib2c-conf.d/generic-ctx-set.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-ctx-set.m2i
+file local/mib2c-conf.d/generic-data-allocate.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-data-allocate.m2i
+file local/mib2c-conf.d/generic-data-context.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-data-context.m2i
+file local/mib2c-conf.d/generic-get-char.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-get-char.m2i
+file local/mib2c-conf.d/generic-get-decl-bot.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-get-decl-bot.m2i
+file local/mib2c-conf.d/generic-get-decl.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-get-decl.m2i
+file local/mib2c-conf.d/generic-get-long.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-get-long.m2i
+file local/mib2c-conf.d/generic-get-oid.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-get-oid.m2i
+file local/mib2c-conf.d/generic-header-bottom.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-header-bottom.m2i
+file local/mib2c-conf.d/generic-header-top.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-header-top.m2i
+file local/mib2c-conf.d/generic-source-includes.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-source-includes.m2i
+file local/mib2c-conf.d/generic-table-constants.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-constants.m2c
+file local/mib2c-conf.d/generic-table-enums.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-enums.m2c
+file local/mib2c-conf.d/generic-table-indexes-from-oid.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-from-oid.m2i
+file local/mib2c-conf.d/generic-table-indexes-set.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-set.m2i
+file local/mib2c-conf.d/generic-table-indexes-to-oid.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-to-oid.m2i
+file local/mib2c-conf.d/generic-table-indexes-varbind-setup.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes-varbind-setup.m2i
+file local/mib2c-conf.d/generic-table-indexes.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-indexes.m2i
+file local/mib2c-conf.d/generic-table-oids.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/generic-table-oids.m2c
+file local/mib2c-conf.d/generic-value-map-func.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-value-map-func.m2i
+file local/mib2c-conf.d/generic-value-map-reverse.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-value-map-reverse.m2i
+file local/mib2c-conf.d/generic-value-map.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/generic-value-map.m2i
+file local/mib2c-conf.d/m2c-internal-warning.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/m2c-internal-warning.m2i
+file local/mib2c-conf.d/m2c_setup_enum.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/m2c_setup_enum.m2i
+file local/mib2c-conf.d/m2c_setup_node.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/m2c_setup_node.m2i
+file local/mib2c-conf.d/m2c_setup_table.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/m2c_setup_table.m2i
+file local/mib2c-conf.d/m2c_table_save_defaults.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/m2c_table_save_defaults.m2i
+file local/mib2c-conf.d/mfd-access-container-cached-defines.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-access-container-cached-defines.m2i
+file local/mib2c-conf.d/mfd-access-unsorted-external-defines.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-access-unsorted-external-defines.m2i
+file local/mib2c-conf.d/mfd-data-access.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-data-access.m2c
+file local/mib2c-conf.d/mfd-data-get.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-data-get.m2c
+file local/mib2c-conf.d/mfd-data-set.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-data-set.m2c
+file local/mib2c-conf.d/mfd-doxygen.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-doxygen.m2c
+file local/mib2c-conf.d/mfd-interactive-setup.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-interactive-setup.m2c
+file local/mib2c-conf.d/mfd-interface.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-interface.m2c
+file local/mib2c-conf.d/mfd-makefile.m2m \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-makefile.m2m
+file local/mib2c-conf.d/mfd-persistence.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-persistence.m2i
+file local/mib2c-conf.d/mfd-readme.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-readme.m2c
+file local/mib2c-conf.d/mfd-top.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/mfd-top.m2c
+file local/mib2c-conf.d/node-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/node-get.m2i
+file local/mib2c-conf.d/node-set.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/node-set.m2i
+file local/mib2c-conf.d/node-storage.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/node-storage.m2i
+file local/mib2c-conf.d/node-validate.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/node-validate.m2i
+file local/mib2c-conf.d/node-varbind-validate.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/node-varbind-validate.m2i
+file local/mib2c-conf.d/parent-dependencies.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/parent-dependencies.m2i
+file local/mib2c-conf.d/parent-set.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/parent-set.m2i
+file local/mib2c-conf.d/subagent.m2c \
+ path=etc/net-snmp/snmp/mib2c-data/subagent.m2c
+file local/mib2c-conf.d/syntax-COUNTER64-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-COUNTER64-get.m2i
+file local/mib2c-conf.d/syntax-DateAndTime-get.m2d \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2d
+file local/mib2c-conf.d/syntax-DateAndTime-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-get.m2i
+file local/mib2c-conf.d/syntax-DateAndTime-readme.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-DateAndTime-readme.m2i
+file local/mib2c-conf.d/syntax-InetAddress-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-get.m2i
+file local/mib2c-conf.d/syntax-InetAddress-set.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddress-set.m2i
+file local/mib2c-conf.d/syntax-InetAddressType-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-get.m2i
+file local/mib2c-conf.d/syntax-InetAddressType-set.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-InetAddressType-set.m2i
+file local/mib2c-conf.d/syntax-RowStatus-dependencies.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-dependencies.m2i
+file local/mib2c-conf.d/syntax-RowStatus-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-get.m2i
+file local/mib2c-conf.d/syntax-RowStatus-varbind-validate.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-RowStatus-varbind-validate.m2i
+file local/mib2c-conf.d/syntax-StorageType-dependencies.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-StorageType-dependencies.m2i
+file local/mib2c-conf.d/syntax-TestAndIncr-get.m2i \
+ path=etc/net-snmp/snmp/mib2c-data/syntax-TestAndIncr-get.m2i
+file local/mib2c.access_functions.conf \
+ path=etc/net-snmp/snmp/mib2c.access_functions.conf
file local/mib2c.array-user.conf path=etc/net-snmp/snmp/mib2c.array-user.conf
-file local/mib2c.check_values.conf path=etc/net-snmp/snmp/mib2c.check_values.conf
-file local/mib2c.check_values_local.conf path=etc/net-snmp/snmp/mib2c.check_values_local.conf
-file local/mib2c.column_defines.conf path=etc/net-snmp/snmp/mib2c.column_defines.conf
-file local/mib2c.column_enums.conf path=etc/net-snmp/snmp/mib2c.column_enums.conf
-file local/mib2c.column_storage.conf path=etc/net-snmp/snmp/mib2c.column_storage.conf
+file local/mib2c.check_values.conf \
+ path=etc/net-snmp/snmp/mib2c.check_values.conf
+file local/mib2c.check_values_local.conf \
+ path=etc/net-snmp/snmp/mib2c.check_values_local.conf
+file local/mib2c.column_defines.conf \
+ path=etc/net-snmp/snmp/mib2c.column_defines.conf
+file local/mib2c.column_enums.conf \
+ path=etc/net-snmp/snmp/mib2c.column_enums.conf
+file local/mib2c.column_storage.conf \
+ path=etc/net-snmp/snmp/mib2c.column_storage.conf
file local/mib2c.conf path=etc/net-snmp/snmp/mib2c.conf
file local/mib2c.container.conf path=etc/net-snmp/snmp/mib2c.container.conf
-file local/mib2c.create-dataset.conf path=etc/net-snmp/snmp/mib2c.create-dataset.conf
+file local/mib2c.create-dataset.conf \
+ path=etc/net-snmp/snmp/mib2c.create-dataset.conf
file local/mib2c.emulation.conf path=etc/net-snmp/snmp/mib2c.emulation.conf
file local/mib2c.genhtml.conf path=etc/net-snmp/snmp/mib2c.genhtml.conf
file local/mib2c.int_watch.conf path=etc/net-snmp/snmp/mib2c.int_watch.conf
file local/mib2c.iterate.conf path=etc/net-snmp/snmp/mib2c.iterate.conf
-file local/mib2c.iterate_access.conf path=etc/net-snmp/snmp/mib2c.iterate_access.conf
+file local/mib2c.iterate_access.conf \
+ path=etc/net-snmp/snmp/mib2c.iterate_access.conf
file local/mib2c.mfd.conf path=etc/net-snmp/snmp/mib2c.mfd.conf
file local/mib2c.notify.conf path=etc/net-snmp/snmp/mib2c.notify.conf
file local/mib2c.old-api.conf path=etc/net-snmp/snmp/mib2c.old-api.conf
@@ -177,72 +200,103 @@
file local/mib2c.row.conf path=etc/net-snmp/snmp/mib2c.row.conf
file local/mib2c.scalar.conf path=etc/net-snmp/snmp/mib2c.scalar.conf
file local/mib2c.table_data.conf path=etc/net-snmp/snmp/mib2c.table_data.conf
-file $(MACH32)/sun/agent/mibs/ENTITY-MIB.txt path=etc/net-snmp/snmp/mibs/ENTITY-MIB.txt
-file $(MACH64)/mibs/LM-SENSORS-MIB.txt path=etc/net-snmp/snmp/mibs/LM-SENSORS-MIB.txt
-file $(MACH64)/mibs/NETWORK-SERVICES-MIB.txt path=etc/net-snmp/snmp/mibs/NETWORK-SERVICES-MIB.txt
-file $(MACH32)/sun/agent/mibs/SUN-MIB.txt path=etc/net-snmp/snmp/mibs/SUN-MIB.txt
-file $(MACH32)/sun/agent/mibs/SUN-SEA-EXTENSIONS-MIB.txt path=etc/net-snmp/snmp/mibs/SUN-SEA-EXTENSIONS-MIB.txt
-file $(MACH32)/sun/agent/mibs/SUN-SEA-PROXY-MIB.txt path=etc/net-snmp/snmp/mibs/SUN-SEA-PROXY-MIB.txt
-file $(MACH32)/sun/agent/mibs/smatrap.mib path=etc/net-snmp/snmp/mibs/smatrap.mib
+dir path=etc/net-snmp/snmp/mibs
file mibs/AGENTX-MIB.txt path=etc/net-snmp/snmp/mibs/AGENTX-MIB.txt
file mibs/DISMAN-EVENT-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-EVENT-MIB.txt
-file mibs/DISMAN-EXPRESSION-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-EXPRESSION-MIB.txt
-file mibs/DISMAN-NSLOOKUP-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-NSLOOKUP-MIB.txt
+file mibs/DISMAN-EXPRESSION-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/DISMAN-EXPRESSION-MIB.txt
+file mibs/DISMAN-NSLOOKUP-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/DISMAN-NSLOOKUP-MIB.txt
file mibs/DISMAN-PING-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-PING-MIB.txt
-file mibs/DISMAN-SCHEDULE-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
-file mibs/DISMAN-SCRIPT-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-SCRIPT-MIB.txt
-file mibs/DISMAN-TRACEROUTE-MIB.txt path=etc/net-snmp/snmp/mibs/DISMAN-TRACEROUTE-MIB.txt
+file mibs/DISMAN-SCHEDULE-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/DISMAN-SCHEDULE-MIB.txt
+file mibs/DISMAN-SCRIPT-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/DISMAN-SCRIPT-MIB.txt
+file mibs/DISMAN-TRACEROUTE-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/DISMAN-TRACEROUTE-MIB.txt
+file $(MACH32)/sun/agent/mibs/ENTITY-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/ENTITY-MIB.txt
file mibs/EtherLike-MIB.txt path=etc/net-snmp/snmp/mibs/EtherLike-MIB.txt
file mibs/HCNUM-TC.txt path=etc/net-snmp/snmp/mibs/HCNUM-TC.txt
-file mibs/HOST-RESOURCES-MIB.txt path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-MIB.txt
-file mibs/HOST-RESOURCES-TYPES.txt path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-TYPES.txt
-file mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt path=etc/net-snmp/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
-file mibs/IANA-LANGUAGE-MIB.txt path=etc/net-snmp/snmp/mibs/IANA-LANGUAGE-MIB.txt
+file mibs/HOST-RESOURCES-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-MIB.txt
+file mibs/HOST-RESOURCES-TYPES.txt \
+ path=etc/net-snmp/snmp/mibs/HOST-RESOURCES-TYPES.txt
+file mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/IANA-ADDRESS-FAMILY-NUMBERS-MIB.txt
+file mibs/IANA-LANGUAGE-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/IANA-LANGUAGE-MIB.txt
file mibs/IANA-RTPROTO-MIB.txt path=etc/net-snmp/snmp/mibs/IANA-RTPROTO-MIB.txt
file mibs/IANAifType-MIB.txt path=etc/net-snmp/snmp/mibs/IANAifType-MIB.txt
-file mibs/IF-INVERTED-STACK-MIB.txt path=etc/net-snmp/snmp/mibs/IF-INVERTED-STACK-MIB.txt
+file mibs/IF-INVERTED-STACK-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/IF-INVERTED-STACK-MIB.txt
file mibs/IF-MIB.txt path=etc/net-snmp/snmp/mibs/IF-MIB.txt
file mibs/INET-ADDRESS-MIB.txt path=etc/net-snmp/snmp/mibs/INET-ADDRESS-MIB.txt
file mibs/IP-FORWARD-MIB.txt path=etc/net-snmp/snmp/mibs/IP-FORWARD-MIB.txt
file mibs/IP-MIB.txt path=etc/net-snmp/snmp/mibs/IP-MIB.txt
-file mibs/IPV6-FLOW-LABEL-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt
+file mibs/IPV6-FLOW-LABEL-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/IPV6-FLOW-LABEL-MIB.txt
file mibs/IPV6-ICMP-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-ICMP-MIB.txt
file mibs/IPV6-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-MIB.txt
file mibs/IPV6-TC.txt path=etc/net-snmp/snmp/mibs/IPV6-TC.txt
file mibs/IPV6-TCP-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-TCP-MIB.txt
file mibs/IPV6-UDP-MIB.txt path=etc/net-snmp/snmp/mibs/IPV6-UDP-MIB.txt
+file $(MACH64)/mibs/LM-SENSORS-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/LM-SENSORS-MIB.txt
file mibs/MTA-MIB.txt path=etc/net-snmp/snmp/mibs/MTA-MIB.txt
-file mibs/NET-SNMP-AGENT-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-AGENT-MIB.txt
-file mibs/NET-SNMP-EXAMPLES-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
-file mibs/NET-SNMP-EXTEND-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-EXTEND-MIB.txt
+file mibs/NET-SNMP-AGENT-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NET-SNMP-AGENT-MIB.txt
+file mibs/NET-SNMP-EXAMPLES-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt
+file mibs/NET-SNMP-EXTEND-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NET-SNMP-EXTEND-MIB.txt
file mibs/NET-SNMP-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-MIB.txt
-file mibs/NET-SNMP-MONITOR-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-MONITOR-MIB.txt
-file mibs/NET-SNMP-SYSTEM-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-SYSTEM-MIB.txt
+file mibs/NET-SNMP-MONITOR-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NET-SNMP-MONITOR-MIB.txt
+file mibs/NET-SNMP-SYSTEM-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NET-SNMP-SYSTEM-MIB.txt
file mibs/NET-SNMP-TC.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-TC.txt
-file mibs/NET-SNMP-VACM-MIB.txt path=etc/net-snmp/snmp/mibs/NET-SNMP-VACM-MIB.txt
-file mibs/NOTIFICATION-LOG-MIB.txt path=etc/net-snmp/snmp/mibs/NOTIFICATION-LOG-MIB.txt
+file mibs/NET-SNMP-VACM-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NET-SNMP-VACM-MIB.txt
+file $(MACH64)/mibs/NETWORK-SERVICES-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NETWORK-SERVICES-MIB.txt
+file mibs/NOTIFICATION-LOG-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/NOTIFICATION-LOG-MIB.txt
file mibs/RFC-1215.txt path=etc/net-snmp/snmp/mibs/RFC-1215.txt
file mibs/RFC1155-SMI.txt path=etc/net-snmp/snmp/mibs/RFC1155-SMI.txt
file mibs/RFC1213-MIB.txt path=etc/net-snmp/snmp/mibs/RFC1213-MIB.txt
file mibs/RMON-MIB.txt path=etc/net-snmp/snmp/mibs/RMON-MIB.txt
file mibs/SMUX-MIB.txt path=etc/net-snmp/snmp/mibs/SMUX-MIB.txt
-file mibs/SNMP-COMMUNITY-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-COMMUNITY-MIB.txt
-file mibs/SNMP-FRAMEWORK-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
+file mibs/SNMP-COMMUNITY-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SNMP-COMMUNITY-MIB.txt
+file mibs/SNMP-FRAMEWORK-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SNMP-FRAMEWORK-MIB.txt
file mibs/SNMP-MPD-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-MPD-MIB.txt
-file mibs/SNMP-NOTIFICATION-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
+file mibs/SNMP-NOTIFICATION-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SNMP-NOTIFICATION-MIB.txt
file mibs/SNMP-PROXY-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-PROXY-MIB.txt
file mibs/SNMP-TARGET-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-TARGET-MIB.txt
-file mibs/SNMP-USER-BASED-SM-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
+file mibs/SNMP-USER-BASED-SM-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
file mibs/SNMP-USM-AES-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-USM-AES-MIB.txt
-file mibs/SNMP-USM-DH-OBJECTS-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
-file mibs/SNMP-VIEW-BASED-ACM-MIB.txt path=etc/net-snmp/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
+file mibs/SNMP-USM-DH-OBJECTS-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
+file mibs/SNMP-VIEW-BASED-ACM-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
file mibs/SNMPv2-CONF.txt path=etc/net-snmp/snmp/mibs/SNMPv2-CONF.txt
file mibs/SNMPv2-MIB.txt path=etc/net-snmp/snmp/mibs/SNMPv2-MIB.txt
file mibs/SNMPv2-SMI.txt path=etc/net-snmp/snmp/mibs/SNMPv2-SMI.txt
file mibs/SNMPv2-TC.txt path=etc/net-snmp/snmp/mibs/SNMPv2-TC.txt
file mibs/SNMPv2-TM.txt path=etc/net-snmp/snmp/mibs/SNMPv2-TM.txt
+file $(MACH32)/sun/agent/mibs/SUN-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SUN-MIB.txt
+file $(MACH32)/sun/agent/mibs/SUN-SEA-EXTENSIONS-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SUN-SEA-EXTENSIONS-MIB.txt
+file $(MACH32)/sun/agent/mibs/SUN-SEA-PROXY-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/SUN-SEA-PROXY-MIB.txt
file mibs/TCP-MIB.txt path=etc/net-snmp/snmp/mibs/TCP-MIB.txt
-file mibs/TRANSPORT-ADDRESS-MIB.txt path=etc/net-snmp/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt
+file mibs/TRANSPORT-ADDRESS-MIB.txt \
+ path=etc/net-snmp/snmp/mibs/TRANSPORT-ADDRESS-MIB.txt
file mibs/TUNNEL-MIB.txt path=etc/net-snmp/snmp/mibs/TUNNEL-MIB.txt
file mibs/UCD-DEMO-MIB.txt path=etc/net-snmp/snmp/mibs/UCD-DEMO-MIB.txt
file mibs/UCD-DISKIO-MIB.txt path=etc/net-snmp/snmp/mibs/UCD-DISKIO-MIB.txt
@@ -252,36 +306,74 @@
file mibs/UCD-SNMP-MIB-OLD.txt path=etc/net-snmp/snmp/mibs/UCD-SNMP-MIB-OLD.txt
file mibs/UCD-SNMP-MIB.txt path=etc/net-snmp/snmp/mibs/UCD-SNMP-MIB.txt
file mibs/UDP-MIB.txt path=etc/net-snmp/snmp/mibs/UDP-MIB.txt
+file $(MACH32)/sun/agent/mibs/smatrap.mib \
+ path=etc/net-snmp/snmp/mibs/smatrap.mib
file apps/snmp_perl_trapd.pl path=etc/net-snmp/snmp/snmp_perl_trapd.pl
-file local/snmpconf.dir/snmp-data/authopts path=etc/net-snmp/snmp/snmpconf-data/snmp-data/authopts
-file local/snmpconf.dir/snmp-data/debugging path=etc/net-snmp/snmp/snmpconf-data/snmp-data/debugging
-file local/snmpconf.dir/snmp-data/mibs path=etc/net-snmp/snmp/snmpconf-data/snmp-data/mibs
-file local/snmpconf.dir/snmp-data/output path=etc/net-snmp/snmp/snmpconf-data/snmp-data/output
-file local/snmpconf.dir/snmp-data/snmpconf-config path=etc/net-snmp/snmp/snmpconf-data/snmp-data/snmpconf-config
-file local/snmpconf.dir/snmpd-data/acl path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/acl
-file local/snmpconf.dir/snmpd-data/basic_setup path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/basic_setup
-file local/snmpconf.dir/snmpd-data/extending path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/extending
-file local/snmpconf.dir/snmpd-data/monitor path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/monitor
-file local/snmpconf.dir/snmpd-data/operation path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/operation
-file local/snmpconf.dir/snmpd-data/snmpconf-config path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/snmpconf-config
-file local/snmpconf.dir/snmpd-data/system path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/system
-file local/snmpconf.dir/snmpd-data/trapsinks path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/trapsinks
-file local/snmpconf.dir/snmptrapd-data/authentication path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/authentication
-file local/snmpconf.dir/snmptrapd-data/formatting path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/formatting
-file local/snmpconf.dir/snmptrapd-data/logging path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/logging
-file local/snmpconf.dir/snmptrapd-data/runtime path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/runtime
-file local/snmpconf.dir/snmptrapd-data/snmpconf-config path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
-file local/snmpconf.dir/snmptrapd-data/traphandle path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/traphandle
-file $(MACH32)/sun/snmpd.conf path=etc/net-snmp/snmp/snmpd.conf overlay=allow preserve=renamenew
-file net-snmp.xml path=lib/svc/manifest/application/management/net-snmp.xml restart_fmri=svc:/system/manifest-import:default
+dir path=etc/net-snmp/snmp/snmpconf-data
+dir path=etc/net-snmp/snmp/snmpconf-data/snmp-data
+file local/snmpconf.dir/snmp-data/authopts \
+ path=etc/net-snmp/snmp/snmpconf-data/snmp-data/authopts
+file local/snmpconf.dir/snmp-data/debugging \
+ path=etc/net-snmp/snmp/snmpconf-data/snmp-data/debugging
+file local/snmpconf.dir/snmp-data/mibs \
+ path=etc/net-snmp/snmp/snmpconf-data/snmp-data/mibs
+file local/snmpconf.dir/snmp-data/output \
+ path=etc/net-snmp/snmp/snmpconf-data/snmp-data/output
+file local/snmpconf.dir/snmp-data/snmpconf-config \
+ path=etc/net-snmp/snmp/snmpconf-data/snmp-data/snmpconf-config
+dir path=etc/net-snmp/snmp/snmpconf-data/snmpd-data
+file local/snmpconf.dir/snmpd-data/acl \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/acl
+file local/snmpconf.dir/snmpd-data/basic_setup \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/basic_setup
+file local/snmpconf.dir/snmpd-data/extending \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/extending
+file local/snmpconf.dir/snmpd-data/monitor \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/monitor
+file local/snmpconf.dir/snmpd-data/operation \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/operation
+file local/snmpconf.dir/snmpd-data/snmpconf-config \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/snmpconf-config
+file local/snmpconf.dir/snmpd-data/system \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/system
+file local/snmpconf.dir/snmpd-data/trapsinks \
+ path=etc/net-snmp/snmp/snmpconf-data/snmpd-data/trapsinks
+dir path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data
+file local/snmpconf.dir/snmptrapd-data/authentication \
+ path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/authentication
+file local/snmpconf.dir/snmptrapd-data/formatting \
+ path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/formatting
+file local/snmpconf.dir/snmptrapd-data/logging \
+ path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/logging
+file local/snmpconf.dir/snmptrapd-data/runtime \
+ path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/runtime
+file local/snmpconf.dir/snmptrapd-data/snmpconf-config \
+ path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
+file local/snmpconf.dir/snmptrapd-data/traphandle \
+ path=etc/net-snmp/snmp/snmpconf-data/snmptrapd-data/traphandle
+file $(MACH32)/sun/snmpd.conf path=etc/net-snmp/snmp/snmpd.conf overlay=allow \
+ preserve=renamenew
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest group=sys
+dir path=lib/svc/manifest/application group=sys
+dir path=lib/svc/manifest/application/management group=sys
+file net-snmp.xml path=lib/svc/manifest/application/management/net-snmp.xml \
+ restart_fmri=svc:/system/manifest-import:default
+dir path=lib/svc/method
file svc-net-snmp path=lib/svc/method/svc-net-snmp
+dir path=usr
+dir path=usr/bin
file path=usr/bin/encode_keychange
file path=usr/bin/fixproc
file path=usr/bin/ipf-mod.pl
file path=usr/bin/mib2c
file path=usr/bin/mib2c-update
+link path=usr/bin/net-snmp-config target=./net-snmp-config-32 variant.arch=i386
+link path=usr/bin/net-snmp-config target=./net-snmp-config-64 variant.arch=sparc
file usr/bin/net-snmp-config path=usr/bin/net-snmp-config-32
-file build/prototype/$(MACH64)/usr/bin/$(MACH64)/net-snmp-config path=usr/bin/net-snmp-config-64
+file build/prototype/$(MACH64)/usr/bin/$(MACH64)/net-snmp-config \
+ path=usr/bin/net-snmp-config-64
file path=usr/bin/snmpbulkget
file path=usr/bin/snmpbulkwalk
file path=usr/bin/snmpcheck
@@ -290,6 +382,7 @@
file path=usr/bin/snmpdf
file path=usr/bin/snmpget
file path=usr/bin/snmpgetnext
+link path=usr/bin/snmpinform target=snmptrap
file path=usr/bin/snmpnetstat
file path=usr/bin/snmpset
file path=usr/bin/snmpstatus
@@ -302,6 +395,9 @@
file path=usr/bin/snmpwalk
file path=usr/bin/tkmib
file path=usr/bin/traptoemail
+dir path=usr/include
+dir path=usr/include/net-snmp
+dir path=usr/include/net-snmp/agent
file path=usr/include/net-snmp/agent/agent_callbacks.h
file path=usr/include/net-snmp/agent/agent_handler.h
file path=usr/include/net-snmp/agent/agent_index.h
@@ -328,35 +424,37 @@
file path=usr/include/net-snmp/agent/old_api.h
file path=usr/include/net-snmp/agent/read_only.h
file path=usr/include/net-snmp/agent/row_merge.h
+file path=usr/include/net-snmp/agent/scalar.h
file path=usr/include/net-snmp/agent/scalar_group.h
-file path=usr/include/net-snmp/agent/scalar.h
file path=usr/include/net-snmp/agent/serialize.h
file path=usr/include/net-snmp/agent/set_helper.h
file path=usr/include/net-snmp/agent/snmp_agent.h
file path=usr/include/net-snmp/agent/snmp_vars.h
file path=usr/include/net-snmp/agent/stash_cache.h
file path=usr/include/net-snmp/agent/stash_to_next.h
+file path=usr/include/net-snmp/agent/table.h
file path=usr/include/net-snmp/agent/table_array.h
file path=usr/include/net-snmp/agent/table_container.h
file path=usr/include/net-snmp/agent/table_data.h
file path=usr/include/net-snmp/agent/table_dataset.h
file path=usr/include/net-snmp/agent/table_iterator.h
file path=usr/include/net-snmp/agent/table_tdata.h
-file path=usr/include/net-snmp/agent/table.h
file path=usr/include/net-snmp/agent/util_funcs.h
file path=usr/include/net-snmp/agent/var_struct.h
file path=usr/include/net-snmp/agent/watcher.h
file path=usr/include/net-snmp/config_api.h
file path=usr/include/net-snmp/definitions.h
+dir path=usr/include/net-snmp/library
+file path=usr/include/net-snmp/library/README
file path=usr/include/net-snmp/library/asn1.h
file path=usr/include/net-snmp/library/callback.h
file path=usr/include/net-snmp/library/check_varbind.h
file path=usr/include/net-snmp/library/cmu_compat.h
+file path=usr/include/net-snmp/library/container.h
file path=usr/include/net-snmp/library/container_binary_array.h
file path=usr/include/net-snmp/library/container_iterator.h
file path=usr/include/net-snmp/library/container_list_ssll.h
file path=usr/include/net-snmp/library/container_null.h
-file path=usr/include/net-snmp/library/container.h
file path=usr/include/net-snmp/library/data_list.h
file path=usr/include/net-snmp/library/default_store.h
file path=usr/include/net-snmp/library/factory.h
@@ -372,8 +470,15 @@
file path=usr/include/net-snmp/library/oid_stash.h
file path=usr/include/net-snmp/library/parse.h
file path=usr/include/net-snmp/library/read_config.h
-file path=usr/include/net-snmp/library/README
file path=usr/include/net-snmp/library/scapi.h
+file path=usr/include/net-snmp/library/snmp-tc.h
+file path=usr/include/net-snmp/library/snmp.h
+file path=usr/include/net-snmp/library/snmpCallbackDomain.h
+file path=usr/include/net-snmp/library/snmpTCPDomain.h
+file path=usr/include/net-snmp/library/snmpTCPIPv6Domain.h
+file path=usr/include/net-snmp/library/snmpUDPDomain.h
+file path=usr/include/net-snmp/library/snmpUDPIPv6Domain.h
+file path=usr/include/net-snmp/library/snmpUnixDomain.h
file path=usr/include/net-snmp/library/snmp_alarm.h
file path=usr/include/net-snmp/library/snmp_api.h
file path=usr/include/net-snmp/library/snmp_assert.h
@@ -386,14 +491,6 @@
file path=usr/include/net-snmp/library/snmp_secmod.h
file path=usr/include/net-snmp/library/snmp_service.h
file path=usr/include/net-snmp/library/snmp_transport.h
-file path=usr/include/net-snmp/library/snmp-tc.h
-file path=usr/include/net-snmp/library/snmp.h
-file path=usr/include/net-snmp/library/snmpCallbackDomain.h
-file path=usr/include/net-snmp/library/snmpTCPDomain.h
-file path=usr/include/net-snmp/library/snmpTCPIPv6Domain.h
-file path=usr/include/net-snmp/library/snmpUDPDomain.h
-file path=usr/include/net-snmp/library/snmpUDPIPv6Domain.h
-file path=usr/include/net-snmp/library/snmpUnixDomain.h
file path=usr/include/net-snmp/library/snmpusm.h
file path=usr/include/net-snmp/library/snmpv3-security-includes.h
file path=usr/include/net-snmp/library/snmpv3.h
@@ -405,6 +502,7 @@
file path=usr/include/net-snmp/library/vacm.h
file path=usr/include/net-snmp/library/winpipe.h
file path=usr/include/net-snmp/library/winservice.h
+dir path=usr/include/net-snmp/machine
file path=usr/include/net-snmp/machine/generic.h
file path=usr/include/net-snmp/mib_api.h
file path=usr/include/net-snmp/net-snmp-config.h
@@ -412,7 +510,9 @@
file path=usr/include/net-snmp/output_api.h
file path=usr/include/net-snmp/pdu_api.h
file path=usr/include/net-snmp/session_api.h
+dir path=usr/include/net-snmp/snmplib
file path=usr/include/net-snmp/snmpv3_api.h
+dir path=usr/include/net-snmp/system
file path=usr/include/net-snmp/system/aix.h
file path=usr/include/net-snmp/system/bsd.h
file path=usr/include/net-snmp/system/bsdi.h
@@ -453,6 +553,7 @@
file path=usr/include/net-snmp/utilities.h
file path=usr/include/net-snmp/varbind_api.h
file path=usr/include/net-snmp/version.h
+dir path=usr/include/ucd-snmp
file path=usr/include/ucd-snmp/agent_index.h
file path=usr/include/ucd-snmp/agent_read_config.h
file path=usr/include/ucd-snmp/agent_registry.h
@@ -465,12 +566,14 @@
file path=usr/include/ucd-snmp/header_complex.h
file path=usr/include/ucd-snmp/int64.h
file path=usr/include/ucd-snmp/keytools.h
+file path=usr/include/ucd-snmp/mib.h
file path=usr/include/ucd-snmp/mib_module_config.h
-file path=usr/include/ucd-snmp/mib.h
file path=usr/include/ucd-snmp/mibincl.h
file path=usr/include/ucd-snmp/parse.h
file path=usr/include/ucd-snmp/read_config.h
file path=usr/include/ucd-snmp/scapi.h
+file path=usr/include/ucd-snmp/snmp-tc.h
+file path=usr/include/ucd-snmp/snmp.h
file path=usr/include/ucd-snmp/snmp_agent.h
file path=usr/include/ucd-snmp/snmp_alarm.h
file path=usr/include/ucd-snmp/snmp_api.h
@@ -480,8 +583,6 @@
file path=usr/include/ucd-snmp/snmp_logging.h
file path=usr/include/ucd-snmp/snmp_parse_args.h
file path=usr/include/ucd-snmp/snmp_vars.h
-file path=usr/include/ucd-snmp/snmp-tc.h
-file path=usr/include/ucd-snmp/snmp.h
file path=usr/include/ucd-snmp/snmpusm.h
file path=usr/include/ucd-snmp/snmpv3.h
file path=usr/include/ucd-snmp/struct.h
@@ -494,97 +595,136 @@
file path=usr/include/ucd-snmp/util_funcs.h
file path=usr/include/ucd-snmp/var_struct.h
file path=usr/include/ucd-snmp/version.h
-file $(MACH64)/sun/agent/modules/entityMib/libentity.so path=usr/lib/$(MACH64)/libentity.so
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmp.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmp.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0
-file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0 path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0
-file $(MACH32)/sun/agent/modules/entityMib/libentity.so path=usr/lib/libentity.so
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+file $(MACH64)/sun/agent/modules/entityMib/libentity.so \
+ path=usr/lib/$(MACH64)/libentity.so
+link path=usr/lib/$(MACH64)/libnetsnmp.so target=./libnetsnmp.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmp.so.15.1.0 \
+ path=usr/lib/$(MACH64)/libnetsnmp.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpagent.so \
+ target=./libnetsnmpagent.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpagent.so.15 \
+ target=./libnetsnmpagent.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0 \
+ path=usr/lib/$(MACH64)/libnetsnmpagent.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmphelpers.so \
+ target=./libnetsnmphelpers.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15 \
+ target=./libnetsnmphelpers.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0 \
+ path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15 \
+ target=./libnetsnmpmibs.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0 \
+ path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmptrapd.so \
+ target=./libnetsnmptrapd.so.15.1.0
+link path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15 \
+ target=./libnetsnmptrapd.so.15.1.0
+file build/prototype/$(MACH64)/usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0 \
+ path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15.1.0
+file $(MACH32)/sun/agent/modules/entityMib/libentity.so \
+ path=usr/lib/libentity.so
+link path=usr/lib/libnetsnmp.so target=./libnetsnmp.so.15.1.0
+link path=usr/lib/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
file path=usr/lib/libnetsnmp.so.15.1.0
+link path=usr/lib/libnetsnmpagent.so target=./libnetsnmpagent.so.15.1.0
+link path=usr/lib/libnetsnmpagent.so.15 target=./libnetsnmpagent.so.15.1.0
file path=usr/lib/libnetsnmpagent.so.15.1.0
+link path=usr/lib/libnetsnmphelpers.so target=./libnetsnmphelpers.so.15.1.0
+link path=usr/lib/libnetsnmphelpers.so.15 target=./libnetsnmphelpers.so.15.1.0
file path=usr/lib/libnetsnmphelpers.so.15.1.0
+link path=usr/lib/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
+link path=usr/lib/libnetsnmpmibs.so.15 target=./libnetsnmpmibs.so.15.1.0
file path=usr/lib/libnetsnmpmibs.so.15.1.0
+link path=usr/lib/libnetsnmptrapd.so target=./libnetsnmptrapd.so.15.1.0
+link path=usr/lib/libnetsnmptrapd.so.15 target=./libnetsnmptrapd.so.15.1.0
file path=usr/lib/libnetsnmptrapd.so.15.1.0
+link path=usr/lib/libsnmp.so target=./libsnmp.so.15.1.0
+link path=usr/lib/libsnmp.so.15 target=./libsnmp.so.15.1.0
file path=usr/lib/libsnmp.so.15.1.0
+dir path=usr/lib/net-snmp
file $(MACH32)/sun/masfcnv path=usr/lib/net-snmp/masfcnv
file $(MACH32)/sun/masfd path=usr/lib/net-snmp/masfd
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::agent::default_store.3
+dir path=usr/perl5
+dir path=usr/perl5/$(PERL_VERSION)
+dir path=usr/perl5/$(PERL_VERSION)/man
+dir path=usr/perl5/$(PERL_VERSION)/man/man3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::ASN.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::OID.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::TrapReceiver.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::agent.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::ASN.3
+file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::agent::default_store.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::default_store.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::netsnmp_request_infoPtr.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::OID.3
-file path=usr/perl5/$(PERL_VERSION)/man/man3/NetSNMP::TrapReceiver.3
file path=usr/perl5/$(PERL_VERSION)/man/man3/SNMP.3
+dir path=usr/perl5/vendor_perl
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle/Makefile.subs.pl
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/ASN.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/OID.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/TrapReceiver.pm
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/Support.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/default_store.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/netsnmp_request_infoPtr.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/default_store.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/SNMP.pm
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Bundle/NetSNMP/.packlist
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/autosplit.ix
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/autosplit.ix
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/autosplit.ix
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/agent.so
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/autosplit.ix
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/autosplit.ix
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/agent/default_store/default_store.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/ASN.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/ASN/autosplit.ix
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/autosplit.ix
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/default_store/default_store.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/OID/OID.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/autosplit.ix
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/autosplit.ix
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.bs
file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/SNMP.so
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Bundle/Makefile.subs.pl
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/default_store.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/netsnmp_request_infoPtr.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/agent/Support.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/ASN.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/default_store.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/OID.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/NetSNMP/TrapReceiver.pm
-file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/SNMP.pm
-file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmpd path=usr/sbin/$(MACH64)/snmpd
-file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmptrapd path=usr/sbin/$(MACH64)/snmptrapd
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/SNMP/autosplit.ix
+dir path=usr/sbin
+dir path=usr/sbin/$(MACH32)
file usr/sbin/snmpd path=usr/sbin/$(MACH32)/snmpd
file usr/sbin/snmptrapd path=usr/sbin/$(MACH32)/snmptrapd
+dir path=usr/sbin/$(MACH64)
+file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmpd \
+ path=usr/sbin/$(MACH64)/snmpd
+file build/prototype/$(MACH64)/usr/sbin/$(MACH64)/snmptrapd \
+ path=usr/sbin/$(MACH64)/snmptrapd
hardlink path=usr/sbin/snmpd target=../../usr/lib/isaexec
hardlink path=usr/sbin/snmptrapd target=../../usr/lib/isaexec
-link path=usr/bin/net-snmp-config target=./net-snmp-config-32 variant.arch=i386
-link path=usr/bin/net-snmp-config target=./net-snmp-config-64 variant.arch=sparc
-link path=usr/bin/snmpinform target=snmptrap
-link path=usr/lib/$(MACH64)/libnetsnmp.so target=./libnetsnmp.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpagent.so target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpagent.so.15 target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmphelpers.so target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmphelpers.so.15 target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmpmibs.so.15 target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmptrapd.so target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/$(MACH64)/libnetsnmptrapd.so.15 target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/libnetsnmp.so target=./libnetsnmp.so.15.1.0
-link path=usr/lib/libnetsnmp.so.15 target=./libnetsnmp.so.15.1.0
-link path=usr/lib/libnetsnmpagent.so target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/libnetsnmpagent.so.15 target=./libnetsnmpagent.so.15.1.0
-link path=usr/lib/libnetsnmphelpers.so target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/libnetsnmphelpers.so.15 target=./libnetsnmphelpers.so.15.1.0
-link path=usr/lib/libnetsnmpmibs.so target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/libnetsnmpmibs.so.15 target=./libnetsnmpmibs.so.15.1.0
-link path=usr/lib/libnetsnmptrapd.so target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/libnetsnmptrapd.so.15 target=./libnetsnmptrapd.so.15.1.0
-link path=usr/lib/libsnmp.so target=./libsnmp.so.15.1.0
-link path=usr/lib/libsnmp.so.15 target=./libsnmp.so.15.1.0
-
-depend fmri=library/python-2/net-snmp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python-2/net-snmp-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+license COPYING license="BSD, BSD-like"
+depend type=conditional \
+ fmri=library/python/net-snmp-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/net-snmp-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/net-snmp/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/net-snmp-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/net-snmp/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/net-snmp-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openscap/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/openscap-26
--- a/components/openscap/openscap-python-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openscap/openscap-python-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Python 2.6 bindings for the Open implementation of SCAP"
set name=com.oracle.info.description \
@@ -40,6 +40,10 @@
file path=usr/lib/python2.6/vendor-packages/openscap_api.py
license openscap.license license="LGPLv2.1, LGPLv3, OVAL"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python 2.6 runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
pkg.debug.depend.path=usr/bin
--- a/components/openscap/openscap.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openscap/openscap.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -2079,5 +2079,5 @@
fmri=library/perl-5/openscap-512@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/perl-512
depend type=conditional \
- fmri=library/python-2/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ fmri=library/python/openscap-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-26
--- a/components/openstack/cinder/cinder.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/cinder/cinder.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -431,7 +431,7 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-26
+depend type=group fmri=library/python/anyjson-26
# force a dependency on package delivering fcinfo(1M)
depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/fcinfo
@@ -445,62 +445,62 @@
# force a dependency on package delivering zfs(1M)
depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zfs
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-26
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/kombu-26
-
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-26
-
-# force a dependency on paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
# force a dependency on pywbem; pkgdepend work is needed to flush this out.
# (dependency is for EMC volume driver)
depend type=require fmri=library/python-2/pywbem
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-26
# force a dependency on glanceclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/glanceclient-26
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-26
+
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-26
# force a dependency on keystoneclient; used via a paste.deploy filter
depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on kombu; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/kombu-26
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-26
+
# force a dependency on novaclient; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/novaclient-26
+# force a dependency on paste; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/paste-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-26
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-26
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-26
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-26
+
# force a dependency on swiftclient; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/swiftclient-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
--- a/components/openstack/glance/glance.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/glance/glance.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -335,61 +335,61 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-26
+depend type=group fmri=library/python/anyjson-26
# force a group dependency on the optional swiftclient; pkgdepend work is needed
# to flush this out.
depend type=group fmri=library/python/swiftclient-26
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-26
+depend type=require fmri=library/python/argparse-26
# force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/boto-26
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-26
-
-# force a dependency on httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/httplib2-26
-
-# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonschema-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/kombu-26
-
-# force a dependency on paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyopenssl-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+depend type=require fmri=library/python/boto-26
# force a dependency on cinderclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/cinderclient-26
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-26
+
+# force a dependency on httplib2; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/httplib2-26
+
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-26
+# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jsonschema-26
+
# force a dependency on keystoneclient; used via a paste.deploy filter
depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on kombu; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/kombu-26
+
+# force a dependency on paste; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/paste-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-26
+# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyopenssl-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-26
+
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
--- a/components/openstack/heat/heat.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/heat/heat.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -312,7 +312,7 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-$(PYV)
+depend type=group fmri=library/python/anyjson-$(PYV)
# force a group dependency on the optional ceilometerclient; pkgdepend work is
# needed to flush this out.
@@ -330,39 +330,14 @@
# to flush this out.
depend type=group fmri=library/python/swiftclient-$(PYV)
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-$(PYV)
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/kombu-$(PYV)
-
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-$(PYV)
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-$(PYV)
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-$(PYV)
-
# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/pyyaml-$(PYV)
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-$(PYV)
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-$(PYV)
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-$(PYV)
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-$(PYV)
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-$(PYV)
@@ -371,11 +346,36 @@
# out.
depend type=require fmri=library/python/keystoneclient-$(PYV)
+# force a dependency on kombu; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/kombu-$(PYV)
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-$(PYV)
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-$(PYV)
+
# force a dependency on novaclient; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/novaclient-$(PYV)
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-$(PYV)
+
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-$(PYV)
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-$(PYV)
--- a/components/openstack/heat/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/heat/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,7 +1,10 @@
library/python-2/eventlet-26
library/python-2/setuptools-26
library/python-2/sqlalchemy-migrate-26
+library/python/eventlet-26
library/python/oslo.config-26
+library/python/setuptools-26
+library/python/sqlalchemy-migrate-26
runtime/python-26
shell/bash
system/core-os
--- a/components/openstack/horizon/horizon.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/horizon/horizon.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# the static dashboard files need to be written by the webserver, so
@@ -1033,7 +1033,7 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-26
+depend type=group fmri=library/python/anyjson-26
# force a group dependency on the optional troveclient; pkgdepend work is needed
# to flush this out.
@@ -1043,32 +1043,6 @@
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-# force a dependency on django_compressor; one of the applications defined in
-# settings.py
-depend type=require fmri=library/python-2/django_compressor-26
-
-# force a dependency on django_openstack_auth; pkgdepend work is needed to flush
-# this out
-depend type=require fmri=library/python-2/django_openstack_auth-26
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/greenlet-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/kombu-26
-
-# force a dependency on lesscpy; one of the filters defined in settings.py
-depend type=require fmri=library/python-2/lesscpy-26
-
-# force a dependency on lockfile; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/lockfile-26
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/netaddr-26
-
-# force a dependency on pytz; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/pytz-26
-
# force a dependency on ceilometerclient; pkgdepend work is needed to flush this
# out
depend type=require fmri=library/python/ceilometerclient-26
@@ -1079,9 +1053,20 @@
# force a dependency on django; pkgdepend work is needed to flush this out
depend type=require fmri=library/python/django-26
+# force a dependency on django_compressor; one of the applications defined in
+# settings.py
+depend type=require fmri=library/python/django_compressor-26
+
+# force a dependency on django_openstack_auth; pkgdepend work is needed to flush
+# this out
+depend type=require fmri=library/python/django_openstack_auth-26
+
# force a dependency on glanceclient; pkgdepend work is needed to flush this out
depend type=require fmri=library/python/glanceclient-26
+# force a dependency on greenlet; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/greenlet-26
+
# force a dependency on heatclient; pkgdepend work is needed to flush this out
depend type=require fmri=library/python/heatclient-26
@@ -1092,6 +1077,18 @@
# out
depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on kombu; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/kombu-26
+
+# force a dependency on lesscpy; one of the filters defined in settings.py
+depend type=require fmri=library/python/lesscpy-26
+
+# force a dependency on lockfile; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/lockfile-26
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/netaddr-26
+
# force a dependency on neutronclient; pkgdepend work is needed to flush this
# out
depend type=require fmri=library/python/neutronclient-26
@@ -1102,6 +1099,9 @@
# force a dependency on pbr; pkgdepend work is needed to flush this out
depend type=require fmri=library/python/pbr-26
+# force a dependency on pytz; pkgdepend work is needed to flush this out
+depend type=require fmri=library/python/pytz-26
+
# force a dependency on six; pkgdepend work is needed to flush this out
depend type=require fmri=library/python/six-26
--- a/components/openstack/keystone/keystone.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/keystone/keystone.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -391,43 +391,18 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-26
+depend type=group fmri=library/python/anyjson-26
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-26
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/kombu-26
-
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-26
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-26
-
-# force a dependency on passlib; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/passlib-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+depend type=require fmri=library/python/babel-26
# force a dependency on dogpile.cache; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/dogpile.cache-26
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-26
+
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-26
@@ -435,5 +410,30 @@
# out.
depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on kombu; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/kombu-26
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-26
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-26
+
+# force a dependency on passlib; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/passlib-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
--- a/components/openstack/neutron/neutron.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/neutron/neutron.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -543,7 +543,7 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-26
+depend type=group fmri=library/python/anyjson-26
# force a dependency on package delivering dnsmasq(8)
depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/inet/dnsmasq
@@ -570,47 +570,19 @@
depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/ippool
# force a dependency on alembic; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/alembic-26
+depend type=require fmri=library/python/alembic-26
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-26
+depend type=require fmri=library/python/babel-26
# force a dependency on cliff; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/cliff-26
+depend type=require fmri=library/python/cliff-26
# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-26
+depend type=require fmri=library/python/greenlet-26
# force a dependency on httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/httplib2-26
-
-# force a dependency on jsonrpclib; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonrpclib-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/kombu-26
-
-# force a dependency on mako; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/mako-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-26
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-26
+depend type=require fmri=library/python/httplib2-26
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-26
@@ -618,18 +590,46 @@
# force a dependency on jinja2; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/jinja2-26
+# force a dependency on jsonrpclib; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jsonrpclib-26
+
# force a dependency on keystoneclient; used via a paste.deploy filter
depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on kombu; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/kombu-26
+
+# force a dependency on mako; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/mako-26
+
# force a dependency on neutronclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/neutronclient-26
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-26
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-26
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-26
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-26
+
# force a dependency on rad-python; pkgdepend work is needed to flush this out
depend type=require fmri=system/management/rad/client/rad-python
--- a/components/openstack/nova/nova.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/nova/nova.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -783,11 +783,11 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-26
+depend type=group fmri=library/python/anyjson-26
# force a group dependency on the optional coverage; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/coverage-26
+depend type=group fmri=library/python/coverage-26
# force a dependency on package delivering archiveadm(1M)
depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/archiveadm
@@ -808,50 +808,10 @@
depend type=require fmri=__TBD pkg.debug.depend.file=usr/sbin/zpool
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-26
+depend type=require fmri=library/python/babel-26
# force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/boto-26
-
-# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-26
-
-# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonschema-26
-
-# force a dependency on kombu; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/kombu-26
-
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-26
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-26
-
-# force a dependency on paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
-# force a dependency on pyasn1; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyasn1-26
-
-# force a dependency on python-ldap; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/python-ldap-26
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-26
-
-# force a dependency on routes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/routes-26
-
-# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/sqlalchemy-26
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-26
+depend type=require fmri=library/python/boto-26
# force a dependency on cinderclient; pkgdepend work is needed to flush this
# out.
@@ -861,25 +821,65 @@
# out.
depend type=require fmri=library/python/glanceclient-26
+# force a dependency on greenlet; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/greenlet-26
+
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-26
# force a dependency on jinja2; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/jinja2-26
+# force a dependency on jsonschema; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jsonschema-26
+
# force a dependency on keystoneclient; used via a paste.deploy filter
depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on kombu; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/kombu-26
+
+# force a dependency on lxml; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/lxml-26
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-26
+
# force a dependency on neutronclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/neutronclient-26
+# force a dependency on paste; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/paste-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-26
+# force a dependency on pyasn1; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyasn1-26
+
+# force a dependency on python-ldap; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/python-ldap-26
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-26
+
+# force a dependency on routes; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/routes-26
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-26
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-26
+
# force a dependency on websockify; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/websockify-26
--- a/components/openstack/nova/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/nova/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -6,6 +6,7 @@
library/python-2/webob-26
library/python/eventlet-26
library/python/oslo.config-26
+library/python/sqlalchemy-26
library/python/sqlalchemy-migrate-26
library/python/webob-26
runtime/python-26
--- a/components/openstack/swift/swift.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/openstack/swift/swift.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,10 +20,28 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+#
+<transform file path=.*/(.*_attr)\.d -> set action.hash files/swift.%<1>>
+<transform file path=.*/(.*_attr)\.d -> default group sys>
+<transform file path=etc/swift/(.*) -> set action.hash etc/%<1>-sample>
+<transform file path=etc/swift/rsyncd.conf -> set action.hash files/rsyncd.conf>
+<transform file path=etc/swift/proxy-server.conf -> set action.hash files/proxy-server.conf>
+<transform dir file path=etc/swift/? -> default owner swift>
+<transform dir file path=etc/swift/? -> default group swift>
+<transform file path=etc/swift/ -> default mode 0644>
+<transform file path=etc/swift/ -> default overlay allow>
+<transform file path=etc/swift/ -> default preserve renamenew>
+<transform file path=lib/svc/.*/([^/]*) -> set action.hash files/%<1>>
+<transform hardlink path=lib/svc/method -> default target swift-proxy-server>
+<transform file path=lib/svc/method/swift-proxy-server -> set action.hash files/swift-smf-method>
+<transform file path=usr/lib/swift/(.*) -> set action.hash usr/bin/%<1>>
+<transform file path=usr/lib/swift/(.*) -> default mode 0555>
+<transform file path=usr/share/man/man1/(.+) -> set action.hash doc/manpages/%<1>>
+<transform file path=usr/share/man/man4/(.+)\.4 -> set action.hash doc/manpages/%<1>.5>
set name=pkg.fmri \
value=pkg:/cloud/openstack/swift@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="OpenStack Swift (Object Storage Service)"
@@ -43,20 +61,9 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2013/350 value=PSARC/2014/050
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-#
-<transform file path=.*/(.*_attr)\.d -> set action.hash files/swift.%<1>>
-<transform file path=.*/(.*_attr)\.d -> default group sys>
file path=etc/security/auth_attr.d/cloud:openstack:swift
file path=etc/security/exec_attr.d/cloud:openstack:swift
file path=etc/security/prof_attr.d/cloud:openstack:swift
-<transform file path=etc/swift/(.*) -> set action.hash etc/%<1>-sample>
-<transform file path=etc/swift/rsyncd.conf -> set action.hash files/rsyncd.conf>
-<transform file path=etc/swift/proxy-server.conf -> set action.hash files/proxy-server.conf>
-<transform dir file path=etc/swift/? -> default owner swift>
-<transform dir file path=etc/swift/? -> default group swift>
-<transform file path=etc/swift/ -> default mode 0644>
-<transform file path=etc/swift/ -> default overlay allow>
-<transform file path=etc/swift/ -> default preserve renamenew>
dir path=etc/swift mode=0700
file path=etc/swift/account-server.conf
file path=etc/swift/container-server.conf
@@ -69,7 +76,6 @@
file path=etc/swift/rsyncd.conf
file path=etc/swift/swift-bench.conf
file path=etc/swift/swift.conf
-<transform file path=lib/svc/.*/([^/]*) -> set action.hash files/%<1>>
file path=lib/svc/manifest/application/openstack/swift-account-auditor.xml
file path=lib/svc/manifest/application/openstack/swift-account-reaper.xml
file path=lib/svc/manifest/application/openstack/swift-account-replicator.xml
@@ -86,8 +92,6 @@
file path=lib/svc/manifest/application/openstack/swift-object-updater.xml
file path=lib/svc/manifest/application/openstack/swift-proxy-server.xml
file path=lib/svc/manifest/application/openstack/swift-replicator-rsync.xml
-<transform hardlink path=lib/svc/method -> default target swift-proxy-server>
-<transform file path=lib/svc/method/swift-proxy-server -> set action.hash files/swift-smf-method>
hardlink path=lib/svc/method/swift-account-auditor
hardlink path=lib/svc/method/swift-account-reaper
hardlink path=lib/svc/method/swift-account-replicator
@@ -195,8 +199,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/container.py
file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/controllers/obj.py
file path=usr/lib/python$(PYVER)/vendor-packages/swift/proxy/server.py
-<transform file path=usr/lib/swift/(.*) -> set action.hash usr/bin/%<1>>
-<transform file path=usr/lib/swift/(.*) -> default mode 0555>
file path=usr/lib/swift/swift-account-auditor
file path=usr/lib/swift/swift-account-reaper
file path=usr/lib/swift/swift-account-replicator
@@ -214,8 +216,6 @@
file path=usr/lib/swift/swift-object-updater
file path=usr/lib/swift/swift-proxy-server
file path=usr/lib/swift/swift-recon-cron
-<transform file path=usr/share/man/man1/(.+) -> set action.hash doc/manpages/%<1>>
-<transform file path=usr/share/man/man4/(.+)\.4 -> set action.hash doc/manpages/%<1>.5>
file path=usr/share/man/man1/swift-account-auditor.1
file path=usr/share/man/man1/swift-account-reaper.1
file path=usr/share/man/man1/swift-account-replicator.1
@@ -254,19 +254,19 @@
#
license LICENSE license="Apache v2.0"
-# force a dependency on netifaces; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netifaces-26
-
-# force a dependency on paste.deploy; pkgdepend work is needed to flush this
-# out.
-depend type=require fmri=library/python-2/paste.deploy-26
-
# force a dependency on dnspython; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/dnspython-26
# force a dependency on keystoneclient; used via a paste.deploy filter
depend type=require fmri=library/python/keystoneclient-26
+# force a dependency on netifaces; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netifaces-26
+
+# force a dependency on paste.deploy; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/paste.deploy-26
+
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-26
--- a/components/pylint/pylint-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/pylint/pylint-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,53 +18,53 @@
#
# 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>
-
-set name=pkg.fmri value=pkg:/developer/python/pylint-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/developer/python/pylint-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="pylint - python code static checker"
-set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
-set name=com.oracle.info.description value="the pylint Python code static checker for Python 2.6"
+set name=pkg.description \
+ value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=com.oracle.info.description \
+ value="the pylint Python code static checker for Python 2.6"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+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=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/325
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2009/325
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/pylint
-dir \
- path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info
-dir path=usr/lib/python2.6/vendor-packages/pylint/checkers
-dir path=usr/lib/python2.6/vendor-packages/pylint/pyreverse
-dir path=usr/lib/python2.6/vendor-packages/pylint/reporters
-
+dir path=usr
+dir path=usr/bin
+link path=usr/bin/epylint target=epylint-2.6 mediator=python \
+ mediator-version=2.6
file path=usr/bin/epylint-2.6
+link path=usr/bin/pylint target=pylint-2.6 mediator=python mediator-version=2.6
file path=usr/bin/pylint-2.6
+link path=usr/bin/pylint-gui target=pylint-gui-2.6 mediator=python \
+ mediator-version=2.6
file path=usr/bin/pylint-gui-2.6
+link path=usr/bin/pyreverse target=pyreverse-2.6 mediator=python \
+ mediator-version=2.6
file path=usr/bin/pyreverse-2.6
+link path=usr/bin/symilar target=symilar-2.6 mediator=python \
+ mediator-version=2.6
file path=usr/bin/symilar-2.6
-
-file \
- path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
-file \
- path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/pylint
+dir path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/requires.txt
+file path=usr/lib/python2.6/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
file path=usr/lib/python2.6/vendor-packages/pylint/__init__.py
file path=usr/lib/python2.6/vendor-packages/pylint/__pkginfo__.py
+dir path=usr/lib/python2.6/vendor-packages/pylint/checkers
file path=usr/lib/python2.6/vendor-packages/pylint/checkers/__init__.py
file path=usr/lib/python2.6/vendor-packages/pylint/checkers/base.py
file path=usr/lib/python2.6/vendor-packages/pylint/checkers/classes.py
@@ -86,37 +86,32 @@
file path=usr/lib/python2.6/vendor-packages/pylint/gui.py
file path=usr/lib/python2.6/vendor-packages/pylint/interfaces.py
file path=usr/lib/python2.6/vendor-packages/pylint/lint.py
+dir path=usr/lib/python2.6/vendor-packages/pylint/pyreverse
file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/__init__.py
file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diadefslib.py
file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/diagrams.py
file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/main.py
file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/utils.py
file path=usr/lib/python2.6/vendor-packages/pylint/pyreverse/writer.py
+dir path=usr/lib/python2.6/vendor-packages/pylint/reporters
file path=usr/lib/python2.6/vendor-packages/pylint/reporters/__init__.py
file path=usr/lib/python2.6/vendor-packages/pylint/reporters/guireporter.py
file path=usr/lib/python2.6/vendor-packages/pylint/reporters/html.py
file path=usr/lib/python2.6/vendor-packages/pylint/reporters/text.py
file path=usr/lib/python2.6/vendor-packages/pylint/testutils.py
file path=usr/lib/python2.6/vendor-packages/pylint/utils.py
+license pylint.license license=GPLv2
-link path=usr/bin/epylint target=epylint-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/pylint target=pylint-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/pylint-gui target=pylint-gui-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/pyreverse target=pyreverse-2.6 mediator=python mediator-version=2.6
-link path=usr/bin/symilar target=symilar-2.6 mediator=python mediator-version=2.6
+# force a dependency on the Python 2.6 runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
+ pkg.debug.depend.path=usr/bin
-license pylint.license license="GPLv2"
+# force a dependency on the pylint package
+depend type=require \
+ fmri=developer/python/pylint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-astng-26 version 0.24.0
+depend type=require fmri=library/python/[email protected]
# force a dependency on logilab-common-26 version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on logilab-astng-26 version 0.24.0
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on the Python 2.6 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.6 \
- pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the pylint package
-depend fmri=developer/python/pylint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require fmri=library/python/[email protected]
--- a/components/pylint/pylint-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/pylint/pylint-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,51 +18,53 @@
#
# 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>
-
-set name=pkg.fmri value=pkg:/developer/python/pylint-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/developer/python/pylint-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="pylint - python code static checker"
-set name=pkg.description value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
-set name=com.oracle.info.description value="the pylint Python code static checker for Python 2.7"
+set name=pkg.description \
+ value="pylint is a Python source code analyzer which looks for programming errors and helps enforce a coding standard"
+set name=com.oracle.info.description \
+ value="the pylint Python code static checker for Python 2.7"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+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=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/325
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2009/325
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/pylint
-dir path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info
-dir path=usr/lib/python2.7/vendor-packages/pylint/checkers
-dir path=usr/lib/python2.7/vendor-packages/pylint/pyreverse
-dir path=usr/lib/python2.7/vendor-packages/pylint/reporters
-
+dir path=usr
+dir path=usr/bin
+link path=usr/bin/epylint target=epylint-2.7 mediator=python \
+ mediator-version=2.7
file path=usr/bin/epylint-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/pylint target=pylint-2.7 mediator=python mediator-version=2.7
file path=usr/bin/pylint-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/pylint-gui target=pylint-gui-2.7 mediator=python \
+ mediator-version=2.7
file path=usr/bin/pylint-gui-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/pyreverse target=pyreverse-2.7 mediator=python \
+ mediator-version=2.7
file path=usr/bin/pyreverse-2.7 pkg.depend.bypass-generate=.*
+link path=usr/bin/symilar target=symilar-2.7 mediator=python \
+ mediator-version=2.7
file path=usr/bin/symilar-2.7 pkg.depend.bypass-generate=.*
-file \
- path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
-file \
- path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/pylint
+dir path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/requires.txt
+file path=usr/lib/python2.7/vendor-packages/pylint-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
file path=usr/lib/python2.7/vendor-packages/pylint/__init__.py
file path=usr/lib/python2.7/vendor-packages/pylint/__pkginfo__.py
+dir path=usr/lib/python2.7/vendor-packages/pylint/checkers
file path=usr/lib/python2.7/vendor-packages/pylint/checkers/__init__.py
file path=usr/lib/python2.7/vendor-packages/pylint/checkers/base.py
file path=usr/lib/python2.7/vendor-packages/pylint/checkers/classes.py
@@ -84,37 +86,32 @@
file path=usr/lib/python2.7/vendor-packages/pylint/gui.py
file path=usr/lib/python2.7/vendor-packages/pylint/interfaces.py
file path=usr/lib/python2.7/vendor-packages/pylint/lint.py
+dir path=usr/lib/python2.7/vendor-packages/pylint/pyreverse
file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/__init__.py
file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/diadefslib.py
file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/diagrams.py
file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/main.py
file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/utils.py
file path=usr/lib/python2.7/vendor-packages/pylint/pyreverse/writer.py
+dir path=usr/lib/python2.7/vendor-packages/pylint/reporters
file path=usr/lib/python2.7/vendor-packages/pylint/reporters/__init__.py
file path=usr/lib/python2.7/vendor-packages/pylint/reporters/guireporter.py
file path=usr/lib/python2.7/vendor-packages/pylint/reporters/html.py
file path=usr/lib/python2.7/vendor-packages/pylint/reporters/text.py
file path=usr/lib/python2.7/vendor-packages/pylint/testutils.py
file path=usr/lib/python2.7/vendor-packages/pylint/utils.py
+license pylint.license license=GPLv2
-link path=usr/bin/epylint target=epylint-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/pylint target=pylint-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/pylint-gui target=pylint-gui-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/pyreverse target=pyreverse-2.7 mediator=python mediator-version=2.7
-link path=usr/bin/symilar target=symilar-2.7 mediator=python mediator-version=2.7
+# force a dependency on the Python 2.7 runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+ pkg.debug.depend.path=usr/bin
-license pylint.license license="GPLv2"
+# force a dependency on the pylint package
+depend type=require \
+ fmri=developer/python/pylint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on logilab-astng-27 version 0.24.0
+depend type=require fmri=library/python/[email protected]
# force a dependency on logilab-common-27 version 0.58.2
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on logilab-astng-27 version 0.24.0
-depend fmri=library/python-2/[email protected] type=require
-
-# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
- pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the pylint package
-depend fmri=developer/python/pylint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require fmri=library/python/[email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/alembic-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/alembic/alembic-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/alembic/alembic-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/alembic-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/alembic-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A database migration tool for SQLAlchemy."
set name=pkg.description \
value="The Python alembic module is a new database migrations tool, offering the following functionality: 1) Can emit ALTER statements to a database in order to change the structure of tables and other constructs. 2) Provides a system whereby 'migration scripts' may be constructed; each script indicates a particular series of steps that can 'upgrade' a target database to a new version, and optionally a series of steps that can 'downgrade' similarly, doing the same steps in reverse. 3) Allows the scripts to execute in some sequential manner."
@@ -76,13 +76,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/alembic/util.py
license alembic.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/alembic-$(PYV)@0.6.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the alembic package
depend type=require \
- fmri=library/python-2/alembic@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/alembic@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on mako; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/mako-$(PYV)
+depend type=require fmri=library/python/mako-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/alembic-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/alembic-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/alembic/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/alembic
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/amqp-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/amqp/amqp-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/amqp/amqp-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/amqp-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/amqp-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="AMQP client library for Python"
set name=pkg.description \
value="Amqp implements a simple non-threaded Python client library for the Advanced Message Queuing Protocol (AMQP) version 0-8."
@@ -51,10 +51,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/amqp/transport.py
license LICENSE license=LGPL2.1
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/amqp-$(PYV)@1.0.12,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the amqp package
depend type=require \
- fmri=library/python-2/amqp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/amqp@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/amqp-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/amqp-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/amqp/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/amqp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/anyjson-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/anyjson/anyjson-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/anyjson/anyjson-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/anyjson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/anyjson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Python module wrapping the best available JSON implementation with a common interface"
set name=pkg.description \
@@ -45,10 +45,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/anyjson/__init__.py
license LICENSE license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/anyjson-$(PYV)@0.3.3,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the anyjson package
depend type=require \
- fmri=library/python-2/anyjson@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/anyjson@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/anyjson-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/anyjson-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/anyjson/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/anyjson
--- a/components/python/argparse/argparse-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/argparse/argparse-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/argparse-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/argparse-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python argparse command-line parsing library"
set name=pkg.description \
value="The argparse module makes it easy to write user-friendly command-line interfaces. The program defines what arguments it requires, and argparse will figure out how to parse those out of sys.argv. The argparse module also automatically generates help and usage messages and issues errors when users give the program invalid arguments."
@@ -43,10 +43,14 @@
file path=usr/lib/python2.6/vendor-packages/argparse.py
license argparse.license license=PSFv2
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
pkg.debug.depend.path=usr/bin
# force a dependency on the argparse package
depend type=require \
- fmri=library/python-2/argparse@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/argparse@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/argparse/argparse.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/argparse/argparse.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/argparse@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/argparse@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python argparse command-line parsing library"
set name=pkg.description \
value="The argparse module makes it easy to write user-friendly command-line interfaces. The program defines what arguments it requires, and argparse will figure out how to parse those out of sys.argv. The argparse module also automatically generates help and usage messages and issues errors when users give the program invalid arguments."
@@ -36,5 +36,8 @@
set name=org.opensolaris.arc-caseid value=PSARC/2013/096
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
depend type=conditional \
- fmri=library/python-2/argparse-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ fmri=library/python/argparse-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-26
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/argparse/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/argparse-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/argparse/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/argparse
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/babel-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/babel/babel-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/babel/babel-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/babel-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/babel-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Internationalization Utilities for Python"
set name=pkg.description \
value="Babel is a Python library that provides an integrated collection of utilities that assist with internationalizing and localizing Python applications (in particular web-based applications)."
@@ -739,9 +739,13 @@
#
license babel.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/babel-$(PYV)@1.3,5.11-0.175.3.0.0.16.0
+
# force a dependency on the babel package
depend type=require \
- fmri=library/python-2/babel@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/babel@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on pytz; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pytz-$(PYV)
+depend type=require fmri=library/python/pytz-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/babel-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/babel-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/babel/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/babel
--- a/components/python/babel/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/babel/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/beautifulsoup4-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/beautifulsoup4/beautifulsoup4-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/beautifulsoup4/beautifulsoup4-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/beautifulsoup4-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/beautifulsoup4-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Screen-scraping library"
set name=pkg.description \
value="Beautiful Soup provides a few simple methods and Pythonic idioms for navigating, searching, and modifying a parse tree: a toolkit for dissecting a document and extracting what you need. It also automatically converts incoming documents to Unicode and outgoing documents to UTF-8. Beautiful Soup sits on top of popular Python parsers like lxml and html5lib, allowing you to try out different parsing strategies or trade speed for flexibility."
@@ -45,13 +45,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/bs4/element.py
license COPYING.txt license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/beautifulsoup4-$(PYV)@4.2.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the beautifulsoup4 package
depend type=require \
- fmri=library/python-2/beautifulsoup4@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/beautifulsoup4@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-$(PYV)
+depend type=require fmri=library/python/lxml-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/beautifulsoup4-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/beautifulsoup4-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/beautifulsoup4/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/beautifulsoup4
--- a/components/python/beautifulsoup4/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/beautifulsoup4/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/lxml-26
library/python-2/lxml-27
+library/python/lxml-26
+library/python/lxml-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/boto-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/boto/boto-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/boto/boto-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/boto-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/boto-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="An Amazon Web Services library for Python"
set name=pkg.description \
value="Boto is a Python package that provides interfaces to Amazon Web Services (AWS). In addition, boto provides support for other public services such as Google Storage in, as well as private cloud systems like Eucalyptus, OpenStack and Nebula."
@@ -433,6 +433,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/boto/vpc/vpngateway.py
license boto.license license="MIT, Apache v2.0, LGPLv2.1"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/boto-$(PYV)@2.9.9,5.11-0.175.3.0.0.16.0
+
# force a dependency on the boto package
depend type=require \
- fmri=library/python-2/boto@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/boto@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/boto-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/boto-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/boto/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/boto
--- a/components/python/boto/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/boto/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,5 +1,8 @@
library/python-2/argparse-26
library/python-2/filechunkio-26
library/python-2/filechunkio-27
+library/python/argparse-26
+library/python/filechunkio-26
+library/python/filechunkio-27
runtime/python-26
runtime/python-27
--- a/components/python/ceilometerclient/ceilometerclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ceilometerclient/ceilometerclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/ceilometerclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -95,22 +95,13 @@
# force a group dependency on the optional simplejson; pkgdepend work is needed
# to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
+depend type=group fmri=library/python/simplejson-$(PYV)
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-$(PYV)
+depend type=require fmri=library/python/babel-$(PYV)
# force a dependency on the ceilometerclient package
depend type=require \
@@ -122,5 +113,14 @@
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/cheetah-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/cheetah/cheetah-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cheetah/cheetah-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/cheetah-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/cheetah-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A template engine and code generation tool"
set name=pkg.description \
value="Cheetah is a template engine and code generation too. It can be used standalone or combined with other tools and frameworks. At its core, Cheetah is a domain-specific language for markup generation and templating which allows for full integration with existing Python code but also offers extensions to traditional Python syntax to allow for easier text generation. Web development is its principal use, but Cheetah is very flexible and can be used to geenrate C++ game code, Java, SQL, form emails, and even Python code."
@@ -112,12 +112,16 @@
file path=usr/lib/python$(PYVER)/vendor-packages/Cheetah/convertTmplPathToModuleName.py
license cheetah.license license="MIT, BSD-style, LGPLv2.1"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/cheetah-$(PYV)@2.4.4,5.11-0.175.3.0.0.16.0
+
# force a dependency on the cheetah package
depend type=require \
- fmri=library/python-2/cheetah@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/cheetah@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on markdown; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/markdown-$(PYV)
+depend type=require fmri=library/python/markdown-$(PYV)
# force a dependency on pygments; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pygments-$(PYV)
+depend type=require fmri=library/python/pygments-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cheetah-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cheetah-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cheetah/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cheetah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/cherrypy-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/cherrypy/cherrypy-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cherrypy/cherrypy-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/cherrypy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/cherrypy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Pythonic, object-oriented HTTP framework"
set name=pkg.description \
value="CherryPy is a Pythonic, object-oriented HTTP framework. It includes a fast, HTTP/1.1-compliant, WSGI thread-pooled web server and also allows the use of any other WSGI-enabled web server or adapter including Apache, lighttpd, mod_python, FastCGI, and mod_wsgi. In addition to supporting a flexible plugin system, CherryPy includes built-in tools for caching, encoding, sessions, authorization, and static content."
@@ -84,10 +84,14 @@
#
license cherrypy.copyright license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/cherrypy-$(PYV)@3.1.2,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the cherrypy package
depend type=require \
- fmri=library/python-2/cherrypy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/cherrypy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cherrypy-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cherrypy-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cherrypy/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cherrypy
--- a/components/python/cinderclient/cinderclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cinderclient/cinderclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/cinderclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -115,26 +115,17 @@
# force a group dependency on the optional eventlet; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/eventlet-$(PYV)
+depend type=group fmri=library/python/eventlet-$(PYV)
# force a group dependency on the optional simplejson; pkgdepend work is needed
# to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
+depend type=group fmri=library/python/simplejson-$(PYV)
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-$(PYV)
+depend type=require fmri=library/python/babel-$(PYV)
# force a dependency on the cinderclient package
depend type=require \
@@ -147,5 +138,14 @@
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/cliff-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/cliff/cliff-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cliff/cliff-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,14 +18,14 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
#
set name=pkg.fmri \
- value=pkg:/library/python-2/cliff-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/cliff-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Command Line Interface Formulation Framework"
set name=pkg.description \
value="The Python cliff module is a framework for building command line programs. It uses setuptools entry points to provide subcommands, output formatters, and other extensions."
@@ -62,19 +62,23 @@
file path=usr/lib/python$(PYVER)/vendor-packages/cliff/show.py
license cliff.license license="Apache v2.0, MIT"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/cliff-$(PYV)@1.4.5,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on the cliff package
depend type=require \
- fmri=library/python-2/cliff@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/cliff@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on cmd2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/cmd2-$(PYV)
+depend type=require fmri=library/python/cmd2-$(PYV)
# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
+depend type=require fmri=library/python/prettytable-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cliff-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cliff-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cliff/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cliff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/cmd2-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/cmd2/cmd2-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cmd2/cmd2-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/cmd2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/cmd2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Extra features for Python cmd module"
set name=pkg.description \
value="The Python cmd2 module is a drop-in replacement for the standard library's cmd module, and provides numerous enhancements for command-prompt tools."
@@ -43,13 +43,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/cmd2.py
license cmd2.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/cmd2-$(PYV)@0.6.7,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the cmd2 package
depend type=require \
- fmri=library/python-2/cmd2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/cmd2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on pyparsing; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyparsing-$(PYV)
+depend type=require fmri=library/python/pyparsing-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cmd2-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cmd2-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cmd2/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cmd2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/cov-core-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/cov-core/cov-core-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cov-core/cov-core-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/cov-core-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/cov-core-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="plugin core for use by pytest-cov, nose-cov and nose2-cov"
set name=pkg.description \
@@ -45,13 +45,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/cov_core_init.py
license LICENSE.txt license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/cov-core-$(PYV)@1.7,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the cov-core package
depend type=require \
- fmri=library/python-2/cov-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/cov-core@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on coverage; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/coverage-$(PYV)
+depend type=require fmri=library/python/coverage-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cov-core-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cov-core-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cov-core/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cov-core
--- a/components/python/cov-core/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cov-core/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/coverage-26
library/python-2/coverage-27
+library/python/coverage-26
+library/python/coverage-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/coverage-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/coverage/coverage-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/coverage/coverage-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/coverage-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/coverage-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The coverage.py Python code coverage tool"
set name=pkg.description \
value="Coverage is a tool for measuring code coverage of Python programs. It monitors a program, noting which parts of the code have been executed, then analyzes the source to identify code that could have been executed, but was not. Coverage measurement is typically used to gauge the effectiveness of tests. It can show which parts of your code are being exercised by tests, and which are not."
@@ -87,6 +87,10 @@
license jquery.copyright license=MIT-1
license jquery.isonscreen.copyright license=MIT-2
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/coverage-$(PYV)@3.5,5.11-0.175.3.0.0.16.0
+
# force a dependency on the coverage package
depend type=require \
- fmri=library/python-2/coverage@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/coverage@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/coverage-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/coverage-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/coverage/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/coverage
--- a/components/python/coverage/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/coverage/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,5 +1,7 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
system/library
--- a/components/python/cssutils/cssutils-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cssutils/cssutils-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,10 +20,14 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# cssutils was previously in the 'desktop' consolidation. This optional
-# dependency is here to facilitate the safe transfer of the package
+# dependency is here to facilitate the safe transfer of the package
# to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+depend type=optional \
+ fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/cssutils/cssutils-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/cssutils/cssutils-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/cssutils-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/cssutils-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A Python package to parse and build CSS Cascading Style Sheets."
set name=com.oracle.info.description value="the cssutils Python module"
@@ -35,7 +35,6 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=LSARC/2008/658
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
file path=usr/lib/python$(PYVER)/vendor-packages/cssutils-0.9.6-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/cssutils-0.9.6-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/cssutils-0.9.6-py$(PYVER).egg-info/dependency_links.txt
@@ -125,8 +124,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/tests/test_tokenize2.py
file path=usr/lib/python$(PYVER)/vendor-packages/tests/test_util.py
file path=usr/lib/python$(PYVER)/vendor-packages/tests/test_x.py
+license cssutils.license license="LGPL v3"
-license cssutils.license license="LGPL v3"
+# cssutils was previously in the 'desktop' consolidation. This optional
+# dependency is here to facilitate the safe transfer of the package
+# to the 'userland' consolidation.
+depend type=optional \
+ fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/cssutils-$(PYV)@0.9.6,5.11-0.175.3.0.0.16.0
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
@@ -134,9 +142,4 @@
# force a dependency on the cssutils package
depend type=require \
- fmri=library/python-2/cssutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# cssutils was previously in the 'desktop' consolidation. This optional
-# dependency is here to facilitate the safe transfer of the package
-# to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+ fmri=library/python/cssutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cssutils/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cssutils-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cssutils/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cssutils-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/cssutils/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/cssutils
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/d2to1-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/d2to1/d2to1-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/d2to1/d2to1-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/d2to1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/d2to1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Allow distutils2-like setup.cfg files with Python 2"
set name=pkg.description \
value="d2to1 allows developers to use distutils2-like setup.cfg files for a package's metadata with a distribute/setuptools setup.py script. It works by providing a distutils2-formatted setup.cfg file containing all of a package's metadata, and a very minimal setup.py which will slurp its arguments from the setup.cfg."
@@ -50,10 +50,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/d2to1/zestreleaser.py
license d2to1.license license="BSD, MIT"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/d2to1-$(PYV)@0.2.10,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the d2to1 package
depend type=require \
- fmri=library/python-2/d2to1@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/d2to1@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/d2to1-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/d2to1-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/d2to1/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/d2to1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/decorator-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/decorator/decorator-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/decorator/decorator-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/decorator-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/decorator-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python decorator helper module"
set name=pkg.description \
value="The aim of the decorator module is to simplify the usage of decorators for the average programmer, and to popularize decorators by showing various non-trivial examples."
@@ -45,10 +45,14 @@
#
license decorator.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/decorator-$(PYV)@3.4.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the decorator package
depend type=require \
- fmri=library/python-2/decorator@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/decorator@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/decorator-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/decorator-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/decorator/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/decorator
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django-appconf/django-appconf-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/django-appconf/django-appconf-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/django-appconf/django-appconf-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/django-appconf-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/django-appconf-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Django App helper class"
set name=pkg.description \
value="A helper class for handling configuration defaults of packaged Django apps gracefully."
@@ -47,6 +47,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/django_appconf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
license LICENSE license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/django-appconf-$(PYV)@0.6,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
@@ -56,7 +60,7 @@
# force a dependency on the django-appconf package
depend type=require \
- fmri=library/python-2/django-appconf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/django-appconf@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on six; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/six-$(PYV)
+depend type=require fmri=library/python/six-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django-appconf/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django-appconf-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django-appconf/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django-appconf-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django-appconf/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django-appconf
--- a/components/python/django/django-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/django/django-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# The functionality of unittest2 is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/unittest2-27 -> drop>
+<transform depend type=require fmri=library/python/unittest2-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/django-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Django Python web framework"
@@ -2393,24 +2393,24 @@
fmri=library/python/django@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on ipython; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/ipython-$(PYV)
+depend type=require fmri=library/python/ipython-$(PYV)
# force a dependency on markdown; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/markdown-$(PYV)
+depend type=require fmri=library/python/markdown-$(PYV)
# force a dependency on python-imaging; pkgdepend work is needed to
# flush this out.
-depend type=require fmri=library/python-2/python-imaging-$(PYV)
+depend type=require fmri=library/python/python-imaging-$(PYV)
# force a dependency on python-mysql; pkgdepend work is needed to
# flush this out.
-depend type=require fmri=library/python-2/python-mysql-$(PYV)
+depend type=require fmri=library/python/python-mysql-$(PYV)
# force a dependency on pytz; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pytz-$(PYV)
+depend type=require fmri=library/python/pytz-$(PYV)
# force a dependency on simplejson; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/simplejson-$(PYV)
+depend type=require fmri=library/python/simplejson-$(PYV)
# force a dependency on unittest2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/unittest2-$(PYV)
+depend type=require fmri=library/python/unittest2-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_compressor/django_compressor-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/django_compressor/django_compressor-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/django_compressor/django_compressor-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/django_compressor-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/django_compressor-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="JavaScript / CSS compressor"
set name=pkg.description \
value="Django Compressor combines and compresses linked and inline Javascript or CSS in a Django templates into cacheable static files."
@@ -93,24 +93,28 @@
file path=usr/lib/python$(PYVER)/vendor-packages/django_compressor-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
license django_compressor.license license="BSD, MIT, Apache 2.0"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/django_compressor-$(PYV)@1.3,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on beautifulsoup4; pkgdepend work is needed to
# flush this out
-depend type=require fmri=library/python-2/beautifulsoup4-$(PYV)
+depend type=require fmri=library/python/beautifulsoup4-$(PYV)
# force a dependency on django; pkgdepend work is needed to flush this out
depend type=require fmri=library/python/django-$(PYV)
# force a dependency on django-appconf; pkgdepend work is needed to
# flush this out
-depend type=require fmri=library/python-2/django-appconf-$(PYV)
+depend type=require fmri=library/python/django-appconf-$(PYV)
# force a dependency on the django_compressor package
depend type=require \
- fmri=library/python-2/django_compressor@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/django_compressor@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on lxml; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/lxml-$(PYV)
+depend type=require fmri=library/python/lxml-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_compressor/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django_compressor-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_compressor/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django_compressor-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_compressor/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django_compressor
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_openstack_auth/django_openstack_auth-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/django_openstack_auth/django_openstack_auth-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/django_openstack_auth/django_openstack_auth-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/django_openstack_auth-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/django_openstack_auth-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Django authentication backend for use with OpenStack Identity"
set name=pkg.description \
@@ -91,6 +91,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/openstack_auth/views.py
license django_openstack_auth.license license="Apache v2.0"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/django_openstack_auth-$(PYV)@1.1.3,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
@@ -100,4 +104,4 @@
# force a dependency on the django_openstack_auth package
depend type=require \
- fmri=library/python-2/django_openstack_auth@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/django_openstack_auth@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_openstack_auth/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django_openstack_auth-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_openstack_auth/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django_openstack_auth-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django_openstack_auth/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django_openstack_auth
--- a/components/python/dogpile.cache/dogpile.cache-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/dogpile.cache/dogpile.cache-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -67,9 +67,6 @@
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-$(PYV)
-
# force a dependency on the dogpile.cache package
depend type=require \
fmri=library/python/dogpile.cache@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -77,3 +74,6 @@
# force a dependency on dogpile.core; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/dogpile.core-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/eventlet-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/eventlet/eventlet-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/eventlet/eventlet-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/eventlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/eventlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Highly concurrent networking library for Python"
set name=pkg.description \
value="Eventlet is a concurrent networking library for Python that allows you to change how you run your code, not how you write it. It uses libevent for highly scalable non-blocking I/O. Coroutines or green threads ensure that the developer uses a blocking style of programming that is similar to threading, but provide the benefits of non-blocking I/O. The event dispatch is implicit, which means you can easily use Eventlet from the Python interpreter, or as a small part of a larger application."
@@ -119,13 +119,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/eventlet/wsgi.py
license eventlet.license license="MIT, Apache 2.0, BSD"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/eventlet-$(PYV)@0.13.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the eventlet package
depend type=require \
- fmri=library/python-2/eventlet@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/eventlet@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on greenlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/greenlet-$(PYV)
+depend type=require fmri=library/python/greenlet-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/eventlet-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/eventlet-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/eventlet/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/eventlet
--- a/components/python/eventlet/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/eventlet/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -2,5 +2,9 @@
library/python-2/pyopenssl-27
library/python-2/python-twisted-26
library/python-2/python-twisted-27
+library/python/pyopenssl-26
+library/python/pyopenssl-27
+library/python/python-twisted-26
+library/python/python-twisted-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/filechunkio-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/filechunkio/filechunkio-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/filechunkio/filechunkio-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/filechunkio-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/filechunkio-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="filechunkio represents a chunk of an OS-level file"
set name=pkg.description \
value="FileChunkIO is a Python library that allows representation of chunks of files. It can be used to segment large files into multiple parts without having to split them physically up front or for creating in-memory chunks as StringIO instances."
@@ -41,10 +41,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/filechunkio/tests.py
license filechunkio.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/filechunkio-$(PYV)@1.5,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the filechunkio package
depend type=require \
- fmri=library/python-2/filechunkio@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/filechunkio@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/filechunkio-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/filechunkio-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/filechunkio/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/filechunkio
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/formencode-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/formencode/formencode-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/formencode/formencode-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/formencode-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/formencode-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="HTML form validation, generation, and conversion package"
set name=pkg.description \
@@ -89,10 +89,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/formencode/variabledecode.py
license formencode.license license="PSF, LGPLv2, MIT"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/formencode-$(PYV)@1.2.6,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the formencode package
depend type=require \
- fmri=library/python-2/formencode@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/formencode@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/formencode-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/formencode-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/formencode/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/formencode
--- a/components/python/glanceclient/glanceclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/glanceclient/glanceclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/glanceclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -85,36 +85,36 @@
# force a group dependency on the optional eventlet; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/eventlet-$(PYV)
+depend type=group fmri=library/python/eventlet-$(PYV)
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
-
-# force a dependency on jsonpatch; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonpatch-$(PYV)
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-$(PYV)
-
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pbr-$(PYV)
-
-# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
-
-# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyopenssl-$(PYV)
-
-# force a dependency on six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/six-$(PYV)
-
-# force a dependency on warlock; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/warlock-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on the glanceclient package
depend type=require \
fmri=library/python/glanceclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+# force a dependency on jsonpatch; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/jsonpatch-$(PYV)
+
# force a dependency on keystoneclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/keystoneclient-$(PYV)
+
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-$(PYV)
+
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pyopenssl-$(PYV)
+
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on warlock; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/warlock-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/greenlet-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/greenlet/greenlet-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/greenlet/greenlet-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/greenlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/greenlet-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Coroutine module for Python"
set name=pkg.description \
value="Greenlet is a Python module providing lightweight coroutines for in-process concurrent programming."
@@ -42,10 +42,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/greenlet.so
license greenlet.license license="MIT, PSFv2"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/greenlet-$(PYV)@0.4.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the greenlet package
depend type=require \
- fmri=library/python-2/greenlet@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/greenlet@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/greenlet-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/greenlet-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/greenlet/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/greenlet
--- a/components/python/heatclient/heatclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/heatclient/heatclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,13 +20,13 @@
#
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
# pyyaml is only delivered for python 2.6
<transform depend type=require fmri=library/python-2/pyyaml-27 -> drop>
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/heatclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -92,22 +92,16 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-$(PYV)
-
-# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
-
-# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
+depend type=group fmri=library/python/anyjson-$(PYV)
# force a dependency on pyyaml; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/pyyaml-$(PYV)
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/argparse-$(PYV)
+
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
# force a dependency on the heatclient package
depend type=require \
@@ -122,5 +116,11 @@
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/httplib2-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/httplib2/httplib2-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/httplib2/httplib2-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/httplib2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/httplib2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A comprehensive HTTP client library for Python"
set name=pkg.description \
value="A comprehensive HTTP client library for Python that supports many features left out of other HTTP libraries, such as Keep-Alive, Authentication, Caching, Redirects, Compression and Lost update support"
@@ -45,10 +45,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/httplib2/socks.py
license httplib2.license license="MIT, BSD, LGPLv2.1, Apache v2.0"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/httplib2-$(PYV)@0.8,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the httplib2 package
depend type=require \
- fmri=library/python-2/httplib2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/httplib2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/httplib2-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/httplib2-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/httplib2/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/httplib2
--- a/components/python/imaging/imaging-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/imaging/imaging-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,10 +20,15 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# python-imaging was previously in the 'desktop' consolidation. This optional
-# dependency is here to facilitate the safe transfer of the package
+# dependency is here to facilitate the safe transfer of the package
# to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+depend type=optional \
+ fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/imaging/imaging-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/imaging/imaging-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,12 +20,12 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
set name=pkg.fmri \
- value=pkg:/library/python-2/python-imaging-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/python-imaging-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python's own image processing library"
set name=pkg.description \
value="The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library provides extensive file format support, an efficient internal representation, and powerful image processing capabilities."
@@ -155,10 +155,14 @@
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/python-imaging-$(PYV)@1.1.7,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the python-imaging package
depend type=require \
- fmri=library/python-2/python-imaging@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/python-imaging@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-imaging-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-imaging-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/imaging/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-imaging
--- a/components/python/importlib/importlib-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/importlib/importlib-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/importlib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/importlib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python importlib module"
set name=pkg.description \
value="The importlib module contains the code from importlib as found in Python 2.7. It is provided so that people who wish to use importlib.import_module() with a version of Python prior to 2.7 or in 3.0 have the function readily available."
@@ -40,10 +40,14 @@
#
license importlib.license license=PSFv2
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
pkg.debug.depend.path=usr/bin
# force a dependency on the importlib package
depend type=require \
- fmri=library/python-2/importlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/importlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/importlib/importlib.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/importlib/importlib.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/importlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/importlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python importlib module"
set name=pkg.description \
value="The importlib module contains the code from importlib as found in Python 2.7. It is provided so that people who wish to use importlib.import_module() with a version of Python prior to 2.7 or in 3.0 have the function readily available."
@@ -35,5 +35,8 @@
set name=org.opensolaris.arc-caseid value=PSARC/2013/279
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
depend type=conditional \
- fmri=library/python-2/importlib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ fmri=library/python/importlib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-26
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/importlib/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/importlib-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/importlib/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/importlib
--- a/components/python/ipython/ipython-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ipython/ipython-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# ipython was previously in the 'desktop' consolidation. This optional
@@ -28,3 +28,6 @@
# to the 'userland' consolidation.
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/ipython/ipython-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ipython/ipython-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,13 +20,14 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Enhanced interactive Python shell"
-set name=com.oracle.info.description value="the IPython interactive Python shell"
+set name=com.oracle.info.description \
+ value="the IPython interactive Python shell"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
@@ -1814,10 +1815,14 @@
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/ipython-$(PYV)@0.10,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the ipython package
depend type=require \
- fmri=library/python-2/ipython@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/ipython@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ipython/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ipython-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ipython/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ipython-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ipython/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ipython
--- a/components/python/ipython/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ipython/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -2,5 +2,9 @@
library/python-2/python-twisted-27
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/python-twisted-26
+library/python/python-twisted-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- a/components/python/jinja2/jinja2-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jinja2/jinja2-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -74,18 +74,18 @@
# force a group dependency on the optional babel; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/babel-$(PYV)
+depend type=group fmri=library/python/babel-$(PYV)
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-# force a dependency on markupsafe; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/markupsafe-$(PYV)
-
-# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-$(PYV)
-
# force a dependency on the jinja2 package
depend type=require \
fmri=library/python/jinja2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on markupsafe; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/markupsafe-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/jsonpatch-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/jsonpatch/jsonpatch-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jsonpatch/jsonpatch-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/jsonpatch-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/jsonpatch-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Python module for creating and applying JSON Patches"
set name=pkg.description \
@@ -49,13 +49,17 @@
#
license jsonpatch.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/jsonpatch-$(PYV)@1.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the jsonpatch package
depend type=require \
- fmri=library/python-2/jsonpatch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/jsonpatch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on jsonpointer; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/jsonpointer-$(PYV)
+depend type=require fmri=library/python/jsonpointer-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonpatch-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonpatch-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpatch/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonpatch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/jsonpointer-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/jsonpointer/jsonpointer-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jsonpointer/jsonpointer-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/jsonpointer-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/jsonpointer-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python module for resolving JSON Pointers"
set name=pkg.description \
value="The jsonpointer module resolves a JSON Pointer -- a string identifier for a specific object within a JSON document - - as defined by RFC 6901."
@@ -42,10 +42,14 @@
#
license jsonpointer.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/jsonpointer-$(PYV)@1.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the jsonpointer package
depend type=require \
- fmri=library/python-2/jsonpointer@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/jsonpointer@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonpointer-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonpointer-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonpointer/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonpointer
--- a/components/python/jsonrpclib/jsonrpclib-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jsonrpclib/jsonrpclib-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,36 +18,40 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python 2.6 implementation of JSON-RPC v2.0"
+set name=com.oracle.info.description \
+ value="the Python 2.6 implementation of JSON-RPC v2.0"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream value="Josh Marshall <[email protected]>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2012/198
-
-license jsonrpclib.license license='Apache v2.0'
-
-# force a dependency on the jsonrpclib package
-depend fmri=library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/jsonrpclib
-file \
- path=usr/lib/python2.6/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.6.egg-info
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/jsonrpclib
+file path=usr/lib/python2.6/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
file path=usr/lib/python2.6/vendor-packages/jsonrpclib/__init__.py
file path=usr/lib/python2.6/vendor-packages/jsonrpclib/config.py
file path=usr/lib/python2.6/vendor-packages/jsonrpclib/history.py
file path=usr/lib/python2.6/vendor-packages/jsonrpclib/jsonclass.py
file path=usr/lib/python2.6/vendor-packages/jsonrpclib/jsonrpc.py
-file path=usr/lib/python2.6/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
+license jsonrpclib.license license="Apache v2.0"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
+# force a dependency on the jsonrpclib package
+depend type=require \
+ fmri=library/python/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/jsonrpclib/jsonrpclib-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jsonrpclib/jsonrpclib-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,36 +18,40 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/jsonrpclib-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python 2.7 implementation of JSON-RPC v2.0"
+set name=com.oracle.info.description \
+ value="the Python 2.7 implementation of JSON-RPC v2.0"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream value="Josh Marshall <[email protected]>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2012/198
-
-license jsonrpclib.license license='Apache v2.0'
-
-# force a dependency on the jsonrpclib package
-depend fmri=library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/jsonrpclib
-file \
- path=usr/lib/python2.7/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.7.egg-info
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/jsonrpclib
+file path=usr/lib/python2.7/vendor-packages/jsonrpclib-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
file path=usr/lib/python2.7/vendor-packages/jsonrpclib/__init__.py
file path=usr/lib/python2.7/vendor-packages/jsonrpclib/config.py
file path=usr/lib/python2.7/vendor-packages/jsonrpclib/history.py
file path=usr/lib/python2.7/vendor-packages/jsonrpclib/jsonclass.py
file path=usr/lib/python2.7/vendor-packages/jsonrpclib/jsonrpc.py
-file path=usr/lib/python2.7/vendor-packages/jsonrpclib/SimpleJSONRPCServer.py
+license jsonrpclib.license license="Apache v2.0"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
+# force a dependency on the jsonrpclib package
+depend type=require \
+ fmri=library/python/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/jsonrpclib/jsonrpclib.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jsonrpclib/jsonrpclib.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,22 +18,27 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/jsonrpclib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of JSON-RPC v2.0"
-set name=com.oracle.info.description value="the Python implementation of JSON-RPC v2.0"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
+set name=com.oracle.info.description \
+ value="the Python implementation of JSON-RPC v2.0"
+set name=info.classification \
+ value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream value="Josh Marshall <[email protected]>"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.upstream value="Josh Marshall <[email protected]>"
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=conditional \
+ fmri=library/python/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/jsonrpclib-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
-depend fmri=library/python-2/jsonrpclib-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python-2/jsonrpclib-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonrpclib-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonrpclib-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonrpclib/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonrpclib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/jsonschema-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/jsonschema/jsonschema-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/jsonschema/jsonschema-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/jsonschema-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/jsonschema-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="An implementation of JSON-Schema validation for Python"
set name=pkg.description \
@@ -56,10 +56,14 @@
#
license COPYING license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/jsonschema-$(PYV)@2.0.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the jsonschema package
depend type=require \
- fmri=library/python-2/jsonschema@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/jsonschema@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonschema-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonschema-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/jsonschema/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/jsonschema
--- a/components/python/keystoneclient/keystoneclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/keystoneclient/keystoneclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/keystoneclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -139,36 +139,21 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-$(PYV)
+depend type=group fmri=library/python/anyjson-$(PYV)
# force a group dependency on the optional eventlet; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/eventlet-$(PYV)
+depend type=group fmri=library/python/eventlet-$(PYV)
# force a group dependency on the optional simplejson; pkgdepend work is needed
# to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
+depend type=group fmri=library/python/simplejson-$(PYV)
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on netaddr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/netaddr-$(PYV)
-
-# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-$(PYV)
-
-# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-$(PYV)
+depend type=require fmri=library/python/babel-$(PYV)
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-$(PYV)
@@ -177,11 +162,26 @@
depend type=require \
fmri=library/python/keystoneclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+# force a dependency on netaddr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/netaddr-$(PYV)
+
# force a dependency on oslo.config; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/oslo.config-$(PYV)
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)
+
+# force a dependency on webob; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/webob-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/kombu-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/kombu/kombu-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/kombu/kombu-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,18 +18,18 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
# importlib is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/importlib-27 -> drop>
+<transform depend type=require fmri=library/python/importlib-27 -> drop>
# ordereddict is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/ordereddict-27 -> drop>
+<transform depend type=require fmri=library/python/ordereddict-27 -> drop>
# The test related file actions have not been included because they will fail
# in dependency generation until the various test related modules that they
# need are also provided.
set name=pkg.fmri \
- value=pkg:/library/python-2/kombu-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/kombu-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Messaging framework for Python"
set name=pkg.description \
value="The aim of Kombu is to make messaging in Python as easy as possible by providing an idiomatic high-level interface for the AMQ protocol (AMQP), and also provide proven and tested solutions to common messaging problems."
@@ -105,34 +105,38 @@
file path=usr/lib/python$(PYVER)/vendor-packages/kombu/utils/url.py
license kombu.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/kombu-$(PYV)@2.5.12,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on amqp; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/amqp-$(PYV)
+depend type=require fmri=library/python/amqp-$(PYV)
# force a dependency on anyjson; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/anyjson-$(PYV)
+depend type=require fmri=library/python/anyjson-$(PYV)
# force a dependency on boto; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/boto-$(PYV)
+depend type=require fmri=library/python/boto-$(PYV)
# force a dependency on eventlet; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/eventlet-$(PYV)
+depend type=require fmri=library/python/eventlet-$(PYV)
# force a dependency on importlib; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/importlib-$(PYV)
+depend type=require fmri=library/python/importlib-$(PYV)
# force a dependency on the kombu package
depend type=require \
- fmri=library/python-2/kombu@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/kombu@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on librabbitmq; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/librabbitmq-$(PYV)
+depend type=require fmri=library/python/librabbitmq-$(PYV)
# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/ordereddict-$(PYV)
+depend type=require fmri=library/python/ordereddict-$(PYV)
# force a dependency on pyrabbit; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyrabbit-$(PYV)
+depend type=require fmri=library/python/pyrabbit-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/kombu-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/kombu-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/kombu
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lesscpy/lesscpy-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/lesscpy/lesscpy-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/lesscpy/lesscpy-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,13 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
- value=pkg:/library/python-2/lesscpy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/lesscpy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python LESS Compiler"
set name=pkg.description \
value="A compiler written in Python for the LESS dynamic stylesheet language. LESS extends CSS with dynamic behavior such as variables, mixins, operations, and functions."
@@ -69,12 +69,16 @@
file path=usr/lib/python$(PYVER)/vendor-packages/lesscpy/scripts/compiler.py
license LICENSE license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/lesscpy-$(PYV)@0.9.10,5.11-0.175.3.0.0.16.0
+
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on the lesscpy package
depend type=require \
- fmri=library/python-2/lesscpy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/lesscpy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on ply; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/ply-$(PYV)
+depend type=require fmri=library/python/ply-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lesscpy/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lesscpy-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lesscpy/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lesscpy-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lesscpy/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lesscpy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/librabbitmq-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/librabbitmq/librabbitmq-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/librabbitmq/librabbitmq-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/librabbitmq-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/librabbitmq-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for AMQP Client"
set name=pkg.description \
value="Provides Python bindings for AMQP clients that wish to communicate with AMQP servers speaking protocol version 0-9-1."
@@ -48,10 +48,14 @@
#
license librabbitmq.license license="MPLv1.1, MIT"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/librabbitmq-$(PYV)@1.0.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the librabbitmq package
depend type=require \
- fmri=library/python-2/librabbitmq@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/librabbitmq@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/librabbitmq-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/librabbitmq-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/librabbitmq
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lockfile/lockfile-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/lockfile/lockfile-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/lockfile/lockfile-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/lockfile-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/lockfile-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="File locking module for Python"
set name=pkg.description \
value="The lockfile package provides a simple API for locking files. Unlike the Windows msvcrt.locking function, the fcntl.lockf and flock functions, and the deprecated posixfile module, the API is identical across both Unix and Windows platforms. The lock mechanism relies on the atomic nature of the link (on Unix) and mkdir (on Windows) system calls."
@@ -44,10 +44,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/lockfile/sqlitelockfile.py
license lockfile.license license="MIT, PSFv2"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/lockfile-$(PYV)@0.9.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the lockfile package
depend type=require \
- fmri=library/python-2/lockfile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/lockfile@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lockfile/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lockfile-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lockfile/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lockfile-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/lockfile/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lockfile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/m2crypto-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/m2crypto/m2crypto-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/m2crypto/m2crypto-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/m2crypto-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/m2crypto-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface for OpenSSL"
set name=pkg.description \
value="M2Crypto is a complete Python wrapper for OpenSSL featuring RSA, DSA, DH, HMACs, message digests, symmetric ciphers (including AES); SSL functionality to implement clients and servers; HTTPS extensions to Python's httplib, urllib, and xmlrpclib; unforgeable HMAC'ing AuthCookies for web session management; FTP/TLS client and server; S/MIME; ZServerSSL: an HTTPS server for Zope; and ZSmime: an S/MIME messenger for Zope. M2Crypto can also be used to provide SSL for Twisted."
@@ -87,10 +87,14 @@
#
license LICENCE license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/m2crypto-$(PYV)@0.21.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the m2crypto package
depend type=require \
- fmri=library/python-2/m2crypto@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/m2crypto@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/m2crypto-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/m2crypto-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/m2crypto/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/m2crypto
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mako/mako-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/mako/mako-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/mako/mako-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/mako-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/mako-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Template library written in Python"
set name=pkg.description \
value="Mako is a template library written in Python. It provides a familiar, non-XML syntax which compiles into Python modules for maximum performance. Mako's syntax and API borrow from the best ideas of many others, including Django templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded Python (i.e., Python Server Page) language, which refines the familiar ideas of componentized layout and inheritance to produce one of the most straightforward and flexible models available while also maintaining close ties to Python calling and scoping semantics."
@@ -67,10 +67,14 @@
#
license LICENSE license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/mako-$(PYV)@0.4.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the mako package
depend type=require \
- fmri=library/python-2/mako@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/mako@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mako/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/mako-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mako/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/mako-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mako/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/mako
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markdown/markdown-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/markdown/markdown-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/markdown/markdown-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/markdown-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/markdown-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python implementation of John Gruber's Markdown"
set name=pkg.description \
value="Markdown is an implementation of John Gruber's Markdown parser that follows the syntax rules and the behavior of the original (markdown.pl) implementation and which is suited to use in web server environments (such that it never raises an exception, never writes to standard output, etc.) It provides an Extension API which makes it possible to change and/or extend the behavior of the parser."
@@ -71,9 +71,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/markdown/util.py
license markdown.license license="BSD, MIT"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/markdown-$(PYV)@2.3.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the markdown package
depend type=require \
- fmri=library/python-2/markdown@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/markdown@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on pygments; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pygments-$(PYV)
+depend type=require fmri=library/python/pygments-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markdown/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/markdown-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markdown/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/markdown-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markdown/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/markdown
--- a/components/python/markdown/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/markdown/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/pygments-26
library/python-2/pygments-27
+library/python/pygments-26
+library/python/pygments-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markupsafe/markupsafe-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/markupsafe/markupsafe-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/markupsafe/markupsafe-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/markupsafe-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/markupsafe-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python HTML string module."
set name=pkg.description \
value="The Python markupsafe module implements an XML/HTML/XHTML Markup safe string for Python."
@@ -49,10 +49,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/markupsafe/tests.py
license markupsafe.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/markupsafe-$(PYV)@0.18,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the markupsafe package
depend type=require \
- fmri=library/python-2/markupsafe@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/markupsafe@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markupsafe/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/markupsafe-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markupsafe/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/markupsafe-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/markupsafe/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/markupsafe
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mock/mock-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/mock/mock-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/mock/mock-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/mock-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/mock-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A unittest library for creating mock objects"
set name=pkg.description \
value="Mock is a library for testing in Python. It allows you to replace parts of your system under test with mock objects and make assertions about how they have been used."
@@ -42,10 +42,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/mock.py
license mock.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/mock-$(PYV)@1.0.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the correct Python runtime package
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the mock package
depend type=require \
- fmri=library/python-2/mock@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/mock@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mock/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/mock-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mock/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/mock-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mock/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/mock
--- a/components/python/mysql/mysql-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/mysql/mysql-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,10 +20,15 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# python-mysql was previously in the 'desktop' consolidation. This optional
-# dependency is here to facilitate the safe transfer of the package
+# dependency is here to facilitate the safe transfer of the package
# to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+depend type=optional \
+ fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/mysql/mysql-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/mysql/mysql-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,14 +20,15 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/python-mysql-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/python-mysql-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A MySQL database adapter for the Python programming language"
-set name=com.oracle.info.description value="the MySQL database adapter for Python"
+set name=com.oracle.info.description \
+ value="the MySQL database adapter for Python"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Databases
@@ -35,15 +36,6 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2008/081
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-# force a dependency on the Python runtime
-depend fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
- pkg.debug.depend.path=usr/bin type=require
-
-# force a dependency on the python-mysql package
-depend fmri=library/python-2/python-mysql@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
file path=usr/lib/python$(PYVER)/vendor-packages/MySQL_python-1.2.2-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/MySQL_python-1.2.2-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/MySQL_python-1.2.2-py$(PYVER).egg-info/dependency_links.txt
@@ -68,4 +60,17 @@
# python-mysql was previously in the 'desktop' consolidation. This optional
# dependency is here to facilitate the safe transfer of the package
# to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+depend type=optional \
+ fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/python-mysql-$(PYV)@1.2.2,5.11-0.175.3.0.0.16.0
+
+# force a dependency on the Python runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+ pkg.debug.depend.path=usr/bin
+
+# force a dependency on the python-mysql package
+depend type=require \
+ fmri=library/python/python-mysql@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mysql/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-mysql-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mysql/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-mysql-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/mysql/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-mysql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netaddr/netaddr-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/netaddr/netaddr-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/netaddr/netaddr-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/netaddr-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/netaddr-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python network address manipulation"
set name=pkg.description \
value="The netaddr Python library represents and manipulates network addresses. It supports the ability to work and interact with the following: IPv4 and IPv6 addresses and subnets; MAC addresses, OUI and IAB identifiers, IEEE EUI-64 identifiers; arbitrary (non-aligned) IP address ranges and IP address sets; various non-CIDR IP range formats such as nmap and glob-style formats."
@@ -75,7 +75,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/netaddr/strategy/ipv6.py
#
license LICENSE license=BSD
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/netaddr-$(PYV)@0.7.10,5.11-0.175.3.0.0.16.0
#
# force a dependency on the netaddr package
depend type=require \
- fmri=library/python-2/netaddr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/netaddr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netaddr/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/netaddr-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netaddr/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/netaddr-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netaddr/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/netaddr
--- a/components/python/netaddr/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/netaddr/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/ipython-26
library/python-2/ipython-27
+library/python/ipython-26
+library/python/ipython-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netifaces/netifaces-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/netifaces/netifaces-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/netifaces/netifaces-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/netifaces-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/netifaces-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Portable access to network interfaces from Python"
set name=pkg.description \
value="netifaces provides a way for Python programmers to get access to a list of the network interfaces on the local machine, and to obtain the addresses of those network interfaces."
@@ -43,10 +43,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/netifaces.so
license netifaces.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/netifaces-$(PYV)@0.8,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the netifaces package
depend type=require \
- fmri=library/python-2/netifaces@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/netifaces@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netifaces/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/netifaces-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netifaces/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/netifaces-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/netifaces/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/netifaces
--- a/components/python/neutronclient/neutronclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/neutronclient/neutronclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/neutronclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -113,19 +113,19 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-$(PYV)
+depend type=group fmri=library/python/anyjson-$(PYV)
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
+depend type=require fmri=library/python/babel-$(PYV)
# force a dependency on cliff; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/cliff-$(PYV)
+depend type=require fmri=library/python/cliff-$(PYV)
# force a dependency on httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/httplib2-$(PYV)
+depend type=require fmri=library/python/httplib2-$(PYV)
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose-cover3/nose-cover3-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/nose-cover3/nose-cover3-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/nose-cover3/nose-cover3-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/nose-cover3-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/nose-cover3-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Coverage support for Nose"
set name=pkg.description \
value="The nosecover3 module provides support for generating Python code coverage reports through the Nose test framework."
@@ -43,16 +43,20 @@
file path=usr/lib/python$(PYVER)/vendor-packages/nosecover3/__init__.py
license LICENSE license=LGPLv2.1
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/nose-cover3-$(PYV)@0.0.4,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on coverage; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/coverage-$(PYV)
+depend type=require fmri=library/python/coverage-$(PYV)
# force a dependency on nose; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/nose-$(PYV)
+depend type=require fmri=library/python/nose-$(PYV)
# force a dependency on the nose-cover3 package
depend type=require \
- fmri=library/python-2/nose-cover3@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/nose-cover3@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose-cover3/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/nose-cover3-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose-cover3/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/nose-cover3-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose-cover3/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/nose-cover3
--- a/components/python/nose-cover3/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/nose-cover3/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -2,5 +2,9 @@
library/python-2/coverage-27
library/python-2/nose-26
library/python-2/nose-27
+library/python/coverage-26
+library/python/coverage-27
+library/python/nose-26
+library/python/nose-27
runtime/python-26
runtime/python-27
--- a/components/python/nose/nose-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/nose/nose-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,9 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
file nosetests.1 path=usr/share/man/man1/nosetests.1
license nose.license license=LGPLv2.1
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/nose/nose-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/nose/nose-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/nose-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/nose-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A unittest-based testing framework for python that makes writing and running tests easier"
set name=com.oracle.info.description value="the Python nose unit test framework"
@@ -91,10 +91,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/nose/util.py
license nose.license license=LGPLv2.1
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/nose-$(PYV)@1.2.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the nose package
depend type=require \
- fmri=library/python-2/nose@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/nose@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/nose-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/nose-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/nose/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/nose
--- a/components/python/nose/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/nose/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- a/components/python/novaclient/novaclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/novaclient/novaclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -19,11 +19,11 @@
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/novaclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
@@ -148,29 +148,17 @@
# force a group dependency on the optional anyjson; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/anyjson-$(PYV)
+depend type=group fmri=library/python/anyjson-$(PYV)
# force a group dependency on the optional simplejson; pkgdepend work is needed
# to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
+depend type=group fmri=library/python/simplejson-$(PYV)
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on babel; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/babel-$(PYV)
-
-# force a dependency on prettytable; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/prettytable-$(PYV)
-
-# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
-
-# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-$(PYV)
-
-# force a dependency on stevedore; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/stevedore-$(PYV)
+depend type=require fmri=library/python/babel-$(PYV)
# force a dependency on iso8601; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/iso8601-$(PYV)
@@ -182,5 +170,17 @@
# force a dependency on pbr; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/pbr-$(PYV)
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
+
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ordereddict/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ordereddict-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ordereddict/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ordereddict
--- a/components/python/ordereddict/ordereddict-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ordereddict/ordereddict-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/ordereddict-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/ordereddict-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python ordereddict library"
set name=com.oracle.info.description \
value="Drop-in substitute for Py2.7's new collections.OrderedDict. The recipe has big-oh performance that matches regular dictionaries (amortized O(1) insertion/deletion/lookup and O(n) iteration/repr/copy/equality_testing)."
@@ -38,10 +38,14 @@
#
license LICENSE license=BSD-like
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python2.6 \
pkg.debug.depend.path=usr/bin
# force a dependency on the ordereddict package
depend type=require \
- fmri=library/python-2/ordereddict@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/ordereddict@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/ordereddict/ordereddict.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ordereddict/ordereddict.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/ordereddict@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/ordereddict@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python ordereddict library"
set name=com.oracle.info.description \
value="Drop-in substitute for Py2.7's new collections.OrderedDict. The recipe has big-oh performance that matches regular dictionaries (amortized O(1) insertion/deletion/lookup and O(n) iteration/repr/copy/equality_testing)."
@@ -33,5 +33,8 @@
set name=org.opensolaris.arc-caseid value=PSARC/2013/280
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
depend type=conditional \
- fmri=library/python-2/ordereddict-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ fmri=library/python/ordereddict-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-26
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/oslo.config/oslo.config-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/oslo.config/oslo.config-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# argparse is part of python 2.7, but separate in 2.6
-<transform depend type=require fmri=library/python-2/argparse-27 -> drop>
+<transform depend type=require fmri=library/python/argparse-27 -> drop>
set name=pkg.fmri \
value=pkg:/library/python/oslo.config-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Oslo Configuration Library"
@@ -62,11 +62,11 @@
pkg.debug.depend.path=usr/bin
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/argparse-$(PYV)
-
-# force a dependency on six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/six-$(PYV)
+depend type=require fmri=library/python/argparse-$(PYV)
# force a dependency on oslo.config
depend type=require \
fmri=library/python/oslo.config@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/passlib/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/passlib-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/passlib/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/passlib-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/passlib/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/passlib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/passlib/passlib-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/passlib/passlib-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/passlib/passlib-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/passlib-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/passlib-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="a comprehensive password hashing framework for Python"
set name=pkg.description \
@@ -114,10 +114,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/passlib/win32.py
license passlib.license license="BSD, MIT"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/passlib-$(PYV)@1.6.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the passlib package
depend type=require \
- fmri=library/python-2/passlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/passlib@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste.deploy/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/paste.deploy-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste.deploy/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/paste.deploy-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste.deploy/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/paste.deploy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste.deploy/paste.deploy-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/paste.deploy/paste.deploy-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/paste.deploy/paste.deploy-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/paste.deploy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/paste.deploy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Load, configure, and compose WSGI applications and servers"
set name=pkg.description \
@@ -57,10 +57,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/paste/deploy/util.py
license docs/license.txt license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/paste.deploy-$(PYV)@1.5.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the paste.deploy package
depend type=require \
- fmri=library/python-2/paste.deploy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/paste.deploy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/paste-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/paste-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/paste
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/paste/paste-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/paste/paste-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/paste/paste-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/paste-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/paste-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Tools for using a Web Server Gateway Interface stack"
set name=pkg.description \
@@ -136,14 +136,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/paste/wsgiwrappers.py
license paste.license license="MIT, PSF"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/paste-$(PYV)@1.7.5.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on paste.deploy; pkgdepend work is needed to flush this
# out.
-depend type=require fmri=library/python-2/paste.deploy-$(PYV)
+depend type=require fmri=library/python/paste.deploy-$(PYV)
# force a dependency on the paste package
depend type=require \
- fmri=library/python-2/paste@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/paste@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/paste/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/paste/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -2,5 +2,9 @@
library/python-2/pyopenssl-27
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/pyopenssl-26
+library/python/pyopenssl-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- a/components/python/pbr/pbr-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pbr/pbr-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -59,11 +59,11 @@
# force a group dependency on the optional nose; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/nose-$(PYV)
+depend type=group fmri=library/python/nose-$(PYV)
# force a group dependency on the optional pip; pkgdepend work is needed to
# flush this out.
-depend type=group fmri=library/python-2/pip-$(PYV)
+depend type=group fmri=library/python/pip-$(PYV)
# force the rename with an optional dependency on the old name
depend type=optional \
@@ -73,9 +73,9 @@
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-$(PYV)
-
# force a dependency on the pbr package
depend type=require \
fmri=library/python/pbr@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
--- a/components/python/pbr/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pbr/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pep8/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pep8-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pep8/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pep8-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pep8/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pep8
--- a/components/python/pep8/pep8-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pep8/pep8-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,10 +18,12 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
file path=usr/share/man/man1/pep8.1
license Oracle.copyright license="Oracle copyright"
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pep8/pep8-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pep8/pep8-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pep8-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pep8-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="pep8 - Python style guide checker"
set name=pkg.description \
value="pep8 is a tool to check your Python code against some of the style conventions in PEP 8 (Style Guide for Python Code)."
@@ -50,6 +50,10 @@
pkg.depend.bypass-generate=.*/test_pep8.*
license pep8.license license="expat license"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pep8-$(PYV)@1.4.4,5.11-0.175.3.0.0.16.0
+
# force a dependency on the pep8 package
depend type=require \
- fmri=library/python-2/pep8@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pep8@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pep8/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pep8/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pip/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pip-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pip/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pip-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pip/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pip
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pip/pip-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pip/pip-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pip/pip-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pip-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pip-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A tool for installing and managing Python packages"
set name=com.oracle.info.description \
value="Pip is a tool which can install Python packages from a variety of sources including PyPI (and other indexes) using requirement specifiers, VCS project URLs, local project directories, local or remote source archives and requirement files which provide an easy way to specify a whole installation environment."
@@ -136,6 +136,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pip/wheel.py
license pip.license license="MIT, LGPL2.1"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pip-$(PYV)@1.4.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the pip package
depend type=require \
- fmri=library/python-2/pip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pip@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pip/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pip/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ply-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ply-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/ply
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/ply/ply-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/ply/ply-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/ply/ply-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/ply-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/ply-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Lex and yacc parsing tools for Python"
set name=pkg.description \
value="PLY is an implementation of lex and yacc parsing tools for Python"
@@ -49,10 +49,13 @@
#
license COPYING license=LGPLv2.1
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/ply-$(PYV)@3.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the ply package
depend type=require \
- fmri=library/python-2/ply@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/ply@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/prettytable/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/prettytable-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/prettytable/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/prettytable-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/prettytable/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/prettytable
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/prettytable/prettytable-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/prettytable/prettytable-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/prettytable/prettytable-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/prettytable-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/prettytable-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A simple Python library for displaying data in an ASCII table"
set name=pkg.description \
@@ -45,10 +45,14 @@
pkg.depend.bypass-generate=.*html.*
license prettytable.license license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/prettytable-$(PYV)@0.7.2,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the prettytable package
depend type=require \
- fmri=library/python-2/prettytable@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/prettytable@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/py/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/py-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/py/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/py-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/py/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/py/py-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/py/py-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/py/py-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/py-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/py-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="library with cross-python path, ini-parsing, io, code, log facilities"
set name=pkg.description \
@@ -74,10 +74,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/py/test.py
license py.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/py-$(PYV)@1.4.15,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the py package
depend type=require \
- fmri=library/python-2/py@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/py@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyasn1-modules-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyasn1-modules-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyasn1-modules
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1-modules/pyasn1-modules-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pyasn1-modules/pyasn1-modules-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pyasn1-modules/pyasn1-modules-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pyasn1-modules-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pyasn1-modules-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A collection of ASN.1-based protocols modules"
set name=pkg.description \
value="pyasn1-modules is a collection of ASN.1 modules expressed in the form of pyasn1 classes. It includes protocols PDUs definition (SNMP, LDAP etc.) and various data structures (X.509, PKCS etc.)."
@@ -63,13 +63,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1_modules/rfc5208.py
license LICENSE license=BSD-like
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pyasn1-modules-$(PYV)@0.0.5,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force dependency on pyasn1; pkgdepend work is needed to flush these out
-depend type=require fmri=library/python-2/pyasn1-$(PYV)
+depend type=require fmri=library/python/pyasn1-$(PYV)
# force a dependency on the pyasn1-modules package
depend type=require \
- fmri=library/python-2/pyasn1-modules@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pyasn1-modules@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyasn1-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyasn1-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyasn1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyasn1/pyasn1-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pyasn1/pyasn1-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pyasn1/pyasn1-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pyasn1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pyasn1-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python ASN.1 implementation"
set name=pkg.description \
value="pyasn1 is an implementation of ASN.1 types and codecs written in Python. It was initially written to support the SNMP protocol but then generalized to be suitable for a wide range of protocols based on the ASN.1 specification."
@@ -69,10 +69,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pyasn1/type/useful.py
license LICENSE license=BSD-like
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pyasn1-$(PYV)@0.1.7,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pyasn1 package
depend type=require \
- fmri=library/python-2/pyasn1@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pyasn1@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pybonjour-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pybonjour-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pybonjour
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pybonjour/pybonjour-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pybonjour/pybonjour-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pybonjour/pybonjour-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pybonjour-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pybonjour-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for Bonjour / DNS-SD"
set name=pkg.description \
value="Pybonjour provides a pure-Python interface to Bonjour and compatible DNS-SD libraries (such as Avahi). It allows Python scripts to take advantage of Zero Configuration Networking (Zeroconf) to register, discover, and resolve services on both local and wide-area networks."
@@ -42,12 +42,16 @@
#
license pybonjour.copyright license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pybonjour-$(PYV)@1.1.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pybonjour package
depend type=require \
- fmri=library/python-2/pybonjour@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pybonjour@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
#
depend type=require fmri=service/network/dns/mdns
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycountry/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycountry-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycountry/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycountry-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycountry/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycountry
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycountry/pycountry-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pycountry/pycountry-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pycountry/pycountry-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pycountry-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pycountry-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="ISO country, subdivision, language, currency and script definitions"
set name=pkg.description \
@@ -371,10 +371,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pycountry/locales/zu/LC_MESSAGES/iso639.mo
license LICENSE.txt license=LGPLv2.1
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pycountry-$(PYV)@0.17,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pycountry package
depend type=require \
- fmri=library/python-2/pycountry@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pycountry@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycups/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycups-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycups/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycups-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycups/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycups
--- a/components/python/pycups/pycups-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pycups/pycups-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,10 +18,11 @@
#
# 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.
#
-set name=pkg.fmri value=pkg:/library/python-2/pycups-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/pycups-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python language bindings for CUPS"
set name=com.oracle.info.description value="Python 2.6 bindings for CUPS"
set name=com.oracle.info.tpno value=$(TPNO)
@@ -30,16 +31,20 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2008/273
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/64
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/64
file path=usr/lib/python2.6/vendor-packages/64/cups.so
file path=usr/lib/python2.6/vendor-packages/cups.so
license pycups.copyright license=LGPLv2.1
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the pycups package
-depend fmri=library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
+depend type=require \
+ fmri=library/python/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pycups/pycups-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pycups/pycups-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,10 +18,11 @@
#
# 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.
#
-set name=pkg.fmri value=pkg:/library/python-2/pycups-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/pycups-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python language bindings for CUPS"
set name=com.oracle.info.description value="Python 2.7 bindings for CUPS"
set name=com.oracle.info.tpno value=$(TPNO)
@@ -30,17 +31,21 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2008/273
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/64
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/64
file path=usr/lib/python2.7/vendor-packages/64/cups.so
file path=usr/lib/python2.7/vendor-packages/cups-1.0-py2.7.egg-info
file path=usr/lib/python2.7/vendor-packages/cups.so
license pycups.copyright license=LGPLv2.1
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the pycups package
-depend fmri=library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
+depend type=require \
+ fmri=library/python/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pycups/pycups.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pycups/pycups.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,23 +18,26 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for CUPS"
-set name=com.oracle.info.description value="the Python language bindings for CUPS"
+set name=com.oracle.info.description \
+ value="the Python language bindings for CUPS"
set name=info.classification value=org.opensolaris.category.2008:System/Printing
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/273
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-depend fmri=library/python-2/pycups-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
+depend type=conditional \
+ fmri=library/python/pycups-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/pycups-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
-depend fmri=library/python-2/pycups-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycurl-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycurl-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycurl/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pycurl
--- a/components/python/pycurl/pycurl-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pycurl/pycurl-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
# we have to reverse the autopyc transform for stuff in /usr/share/doc
@@ -71,3 +71,6 @@
file path=usr/share/doc/pycurl/tests/util.py
#
license pycurl.copyright license=MIT
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pycurl/pycurl-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pycurl/pycurl-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pycurl-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pycurl-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for libcurl"
set name=pkg.description \
value="PycURL provides a thin layer of Python bindings on top of libcurl."
@@ -42,10 +42,14 @@
#
license pycurl.copyright license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pycurl-$(PYV)@7.19.0.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pycurl package
depend type=require \
- fmri=library/python-2/pycurl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pycurl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pydns/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pydns-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pydns/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pydns-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pydns/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pydns
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pydns/pydns-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pydns/pydns-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pydns/pydns-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pydns-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pydns-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python DNS library"
set name=pkg.description \
value="PyDNS provides a module for performing DNS queries from Python applications."
@@ -47,10 +47,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pydns-$(COMPONENT_VERSION)-py$(PYVER).egg-info
license pydns.license license=PSF
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pydns-$(PYV)@2.3.6,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pydns package
depend type=require \
- fmri=library/python-2/pydns@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pydns@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyflakes/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyflakes-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyflakes/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyflakes-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyflakes/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyflakes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyflakes/pyflakes-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pyflakes/pyflakes-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pyflakes/pyflakes-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pyflakes-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pyflakes-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="passive checker of Python programs"
set name=pkg.description \
value="Pyflakes analyzes programs and detects various errors. It works by parsing the source file, not importing it, so it is safe to use on modules with side effects. It's also much faster."
@@ -52,6 +52,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pyflakes/scripts/pyflakes.py
license LICENSE license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pyflakes-$(PYV)@0.7.2,5.11-0.175.3.0.0.16.0
+
# force a dependency on the pyflakes package
depend type=require \
- fmri=library/python-2/pyflakes@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pyflakes@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pyflakes/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pyflakes/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pygments/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pygments-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pygments/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pygments-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pygments/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pygments
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pygments/pygments-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pygments/pygments-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pygments/pygments-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pygments-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pygments-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A syntax highlighting package written in Python"
set name=pkg.description \
value="Pygments is a generic syntax highlighter for general use in all kinds of software such as forum systems, wikis, or other applications that need to prettify source code. It supports a wide range of common languages and markup formats, and new languages and formats can be added easily. A number of output formats are available, including: HTML, ANSI sequences (console output), LaTeX, and RTF."
@@ -123,6 +123,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pygments/util.py
license pygments.license license="BSD, GPLv2, GPLv3, LGPLv2.1, CPLv1.1"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pygments-$(PYV)@1.6,5.11-0.175.3.0.0.16.0
+
# force a dependency on the pygments package
depend type=require \
- fmri=library/python-2/pygments@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pygments@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pygments/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pygments/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylxml/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lxml-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylxml/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lxml-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pylxml/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/lxml
--- a/components/python/pylxml/pylxml-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pylxml/pylxml-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,14 +18,15 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
-set name=com.oracle.info.description value="Python 2.6 bindings for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description \
+ value="Python 2.6 bindings for the libxml2 and libxslt libraries"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
@@ -33,31 +34,22 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2009/579
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources
-dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng
-dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl
-dir \
- path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/lxml
-dir \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info
-dir path=usr/lib/python2.6/vendor-packages/lxml/64
-dir path=usr/lib/python2.6/vendor-packages/lxml/html
-dir path=usr/lib/python2.6/vendor-packages/lxml/isoschematron
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
-file \
- path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl
+dir path=lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/lxml
+dir path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/PKG-INFO
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/SOURCES.txt
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/dependency_links.txt
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/not-zip-safe
+file path=usr/lib/python2.6/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.6.egg-info/top_level.txt
+dir path=usr/lib/python2.6/vendor-packages/lxml/64
file path=usr/lib/python2.6/vendor-packages/lxml/64/etree.so
file path=usr/lib/python2.6/vendor-packages/lxml/64/objectify.so
file path=usr/lib/python2.6/vendor-packages/lxml/ElementInclude.py
@@ -69,6 +61,7 @@
file path=usr/lib/python2.6/vendor-packages/lxml/etree.so
file path=usr/lib/python2.6/vendor-packages/lxml/etree_defs.h
file path=usr/lib/python2.6/vendor-packages/lxml/etreepublic.pxd
+dir path=usr/lib/python2.6/vendor-packages/lxml/html
file path=usr/lib/python2.6/vendor-packages/lxml/html/ElementSoup.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/__init__.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/_dictmixin.py
@@ -83,25 +76,17 @@
file path=usr/lib/python2.6/vendor-packages/lxml/html/html5parser.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/soupparser.py
file path=usr/lib/python2.6/vendor-packages/lxml/html/usedoctest.py
+dir path=usr/lib/python2.6/vendor-packages/lxml/isoschematron
file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/__init__.py
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
-file \
- path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
+file path=usr/lib/python2.6/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
file path=usr/lib/python2.6/vendor-packages/lxml/objectify.so
file path=usr/lib/python2.6/vendor-packages/lxml/pyclasslookup.py
file path=usr/lib/python2.6/vendor-packages/lxml/sax.py
@@ -109,6 +94,9 @@
file path=usr/lib/python2.6/vendor-packages/lxml/usedoctest.py
license pylxml.copyright license="BSD, PSF, GPL"
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the lxml package
-depend fmri=library/python-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require \
+ fmri=library/python/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pylxml/pylxml-27.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pylxml/pylxml-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,51 +18,49 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/lxml-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/lxml-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.7 binding for the libxml2 and libxslt libraries"
-set name=com.oracle.info.description value="Python 2.7 bindings for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description \
+ value="Python 2.7 bindings for the libxml2 and libxslt libraries"
set name=com.oracle.info.tpno value=$(TPNO)
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2009/579
+set name=org.opensolaris.arc-caseid value=PSARC/2009/579
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license pylxml.copyright license="BSD, PSF, GPL"
-dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources
-dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/rng
-dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl
-dir \
- path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/lxml
-dir path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info
-dir path=usr/lib/python2.7/vendor-packages/lxml/64
-dir path=usr/lib/python2.7/vendor-packages/lxml/html
+dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources
+dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/rng
+dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl
+dir path=lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/lxml
+dir path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info
+file path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
+file path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
file path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info/dependency_links.txt
file path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info/not-zip-safe
-file path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info/PKG-INFO
-file path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info/SOURCES.txt
file path=usr/lib/python2.7/vendor-packages/lxml-$(COMPONENT_VERSION)-py2.7.egg-info/top_level.txt
+dir path=usr/lib/python2.7/vendor-packages/lxml/64
+file path=usr/lib/python2.7/vendor-packages/lxml/64/etree.so
+file path=usr/lib/python2.7/vendor-packages/lxml/64/objectify.so
+file path=usr/lib/python2.7/vendor-packages/lxml/ElementInclude.py
file path=usr/lib/python2.7/vendor-packages/lxml/__init__.py
file path=usr/lib/python2.7/vendor-packages/lxml/_elementpath.py
-file path=usr/lib/python2.7/vendor-packages/lxml/64/etree.so
-file path=usr/lib/python2.7/vendor-packages/lxml/64/objectify.so
file path=usr/lib/python2.7/vendor-packages/lxml/builder.py
file path=usr/lib/python2.7/vendor-packages/lxml/cssselect.py
file path=usr/lib/python2.7/vendor-packages/lxml/doctestcompare.py
-file path=usr/lib/python2.7/vendor-packages/lxml/ElementInclude.py
file path=usr/lib/python2.7/vendor-packages/lxml/etree.so
file path=usr/lib/python2.7/vendor-packages/lxml/etree_defs.h
file path=usr/lib/python2.7/vendor-packages/lxml/etreepublic.pxd
+dir path=usr/lib/python2.7/vendor-packages/lxml/html
+file path=usr/lib/python2.7/vendor-packages/lxml/html/ElementSoup.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/__init__.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/_dictmixin.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/_diffcommand.py
@@ -71,36 +69,30 @@
file path=usr/lib/python2.7/vendor-packages/lxml/html/clean.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/defs.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/diff.py
-file path=usr/lib/python2.7/vendor-packages/lxml/html/ElementSoup.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/formfill.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/html5parser.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/soupparser.py
file path=usr/lib/python2.7/vendor-packages/lxml/html/usedoctest.py
file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/__init__.py
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
-file \
- path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/rng/iso-schematron.rng
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/RNG2Schtrn.xsl
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/XSD2Schtrn.xsl
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_abstract_expand.xsl
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_dsdl_include.xsl
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_message.xsl
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_schematron_skeleton_for_xslt1.xsl
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/iso_svrl_for_xslt1.xsl
+file path=usr/lib/python2.7/vendor-packages/lxml/isoschematron/resources/xsl/iso-schematron-xslt1/readme.txt
file path=usr/lib/python2.7/vendor-packages/lxml/objectify.so
file path=usr/lib/python2.7/vendor-packages/lxml/pyclasslookup.py
file path=usr/lib/python2.7/vendor-packages/lxml/sax.py
file path=usr/lib/python2.7/vendor-packages/lxml/tree.pxd
file path=usr/lib/python2.7/vendor-packages/lxml/usedoctest.py
+license pylxml.copyright license="BSD, PSF, GPL"
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
# force a dependency on the lxml package
-depend fmri=library/python-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require \
+ fmri=library/python/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pylxml/pylxml.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pylxml/pylxml.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,26 +18,27 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/lxml@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic 2.6 binding for the libxml2 and libxslt libraries"
-set name=com.oracle.info.description value="Python bindings for the libxml2 and libxslt libraries"
+set name=com.oracle.info.description \
+ value="Python bindings for the libxml2 and libxslt libraries"
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=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2009/579
+set name=org.opensolaris.arc-caseid value=PSARC/2009/579
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=conditional \
+ fmri=library/python/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/lxml-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27
-depend fmri=library/python-2/lxml-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python-2/lxml-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyopenssl/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyopenssl-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyopenssl/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyopenssl-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyopenssl/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyopenssl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyopenssl/pyopenssl-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pyopenssl/pyopenssl-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pyopenssl/pyopenssl-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# 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.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pyopenssl-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pyopenssl-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python interface to the OpenSSL library"
set name=com.oracle.info.description value="Python bindings for OpenSSL"
set name=com.oracle.info.tpno value=$(TPNO)
@@ -49,12 +49,16 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pyOpenSSL-$(COMPONENT_VERSION)-py$(PYVER).egg-info
license LICENSE license=Apache2
+
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pyopenssl-$(PYV)@0.13,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pyopenssl package
depend type=require \
- fmri=library/python-2/pyopenssl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-
+ fmri=library/python/pyopenssl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyparsing/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyparsing-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyparsing/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyparsing-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyparsing/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyparsing
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyparsing/pyparsing-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pyparsing/pyparsing-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pyparsing/pyparsing-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pyparsing-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pyparsing-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python parsing module"
set name=pkg.description \
value="The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code."
@@ -39,10 +39,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pyparsing.py
license pyparsing.license license="MIT, GPLv3, BSD"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pyparsing-$(PYV)@2.0.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pyparsing package
depend type=require \
- fmri=library/python-2/pyparsing@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pyparsing@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyrabbit/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyrabbit-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyrabbit/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyrabbit-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyrabbit/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pyrabbit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pyrabbit/pyrabbit-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pyrabbit/pyrabbit-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pyrabbit/pyrabbit-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pyrabbit-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pyrabbit-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Pythonic interface to the RabbitMQ Management HTTP API"
set name=pkg.description \
@@ -50,11 +50,15 @@
#
license pyrabbit.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pyrabbit-$(PYV)@1.0.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-depend type=require fmri=library/python-2/httplib2-$(PYV)
+depend type=require fmri=library/python/httplib2-$(PYV)
# force a dependency on the pyrabbit package
depend type=require \
- fmri=library/python-2/pyrabbit@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pyrabbit@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-capturelog/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-capturelog-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-capturelog/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-capturelog-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-capturelog/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-capturelog
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-capturelog/pytest-capturelog-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pytest-capturelog/pytest-capturelog-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest-capturelog/pytest-capturelog-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pytest-capturelog-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pytest-capturelog-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A pytest plugin to capture log messages"
set name=pkg.description \
value="The capturelog pytest plugin when installed will cause log messages to be captured by default and for each failed test, standard output and error will be captured in the same manner. By default, each captured log message shows the module, line number, log level, and message. If desired, the log format and date format can be specified to anything that the logging module supports."
@@ -44,13 +44,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_capturelog.py
license pytest-capturelog.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pytest-capturelog-$(PYV)@0.7,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on pytest
-depend type=require fmri=library/python-2/pytest-$(PYV)
+depend type=require fmri=library/python/pytest-$(PYV)
# force a dependency on the pytest-capturelog package
depend type=require \
- fmri=library/python-2/pytest-capturelog@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pytest-capturelog@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-codecheckers/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-codecheckers-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-codecheckers/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-codecheckers-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-codecheckers/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-codecheckers
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-codecheckers/pytest-codecheckers-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pytest-codecheckers/pytest-codecheckers-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest-codecheckers/pytest-codecheckers-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pytest-codecheckers-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pytest-codecheckers-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A pytest plugin to add source code sanity checks (pep8 and friends)"
set name=pkg.description \
@@ -48,22 +48,26 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_codecheckers-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
license pytest-codecheckers.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pytest-codecheckers-$(PYV)@0.2,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on pep8; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pep8-$(PYV)
+depend type=require fmri=library/python/pep8-$(PYV)
# force a dependency on py; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/py-$(PYV)
+depend type=require fmri=library/python/py-$(PYV)
# force a dependency on pyflakes; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyflakes-$(PYV)
+depend type=require fmri=library/python/pyflakes-$(PYV)
# force a dependency on pytest
-depend type=require fmri=library/python-2/pytest-$(PYV)
+depend type=require fmri=library/python/pytest-$(PYV)
# force a dependency on the pytest-codecheckers package
depend type=require \
- fmri=library/python-2/pytest-codecheckers@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pytest-codecheckers@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pytest-codecheckers/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest-codecheckers/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -4,5 +4,11 @@
library/python-2/py-27
library/python-2/pyflakes-26
library/python-2/pyflakes-27
+library/python/pep8-26
+library/python/pep8-27
+library/python/py-26
+library/python/py-27
+library/python/pyflakes-26
+library/python/pyflakes-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-cov/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-cov-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-cov/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-cov-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-cov/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-cov
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest-cov/pytest-cov-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pytest-cov/pytest-cov-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest-cov/pytest-cov-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pytest-cov-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pytest-cov-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A pytest plugin for coverage reporting"
set name=pkg.description \
value="A pytest plugin that produces coverage reports. It supports centralised testing and distributed testing in both load and each modes. It also supports coverage of subprocesses."
@@ -44,16 +44,20 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pytest_cov.py
license LICENSE.txt license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pytest-cov-$(PYV)@1.6,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on cov-core; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/cov-core-$(PYV)
+depend type=require fmri=library/python/cov-core-$(PYV)
# force a dependency on pytest
-depend type=require fmri=library/python-2/pytest-$(PYV)
+depend type=require fmri=library/python/pytest-$(PYV)
# force a dependency on the pytest-cov package
depend type=require \
- fmri=library/python-2/pytest-cov@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pytest-cov@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pytest-cov/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest-cov/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/cov-core-26
library/python-2/cov-core-27
+library/python/cov-core-26
+library/python/cov-core-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytest
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytest/pytest-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pytest/pytest-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest/pytest-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pytest-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pytest-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python testing tool"
set name=pkg.description \
value="The Python py.test testing tool makes it easy to write small tests, yet scales to support complex functional testing."
@@ -78,6 +78,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/pytest.py
license pytest.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pytest-$(PYV)@2.3.5,5.11-0.175.3.0.0.16.0
+
# force a dependency on the pytest package
depend type=require \
- fmri=library/python-2/pytest@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pytest@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/pytest/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytest/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-ldap/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-ldap-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-ldap/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-ldap-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-ldap/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-ldap
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python-ldap/python-ldap-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/python-ldap/python-ldap-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/python-ldap/python-ldap-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/python-ldap-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/python-ldap-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="LDAP client library for Python"
set name=pkg.description \
value="python-ldap provides an object-oriented API to access LDAP directory servers from Python programs. Mainly it wraps the OpenLDAP 2.x library for that purpose."
@@ -76,10 +76,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/python_ldap-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
license python-ldap.license license=PSF
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/python-ldap-$(PYV)@2.4.10,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the python-ldap package
depend type=require \
- fmri=library/python-2/python-ldap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/python-ldap@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/python-ldap/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/python-ldap/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -3,6 +3,10 @@
library/python-2/pyasn1-27
library/python-2/pyasn1-modules-26
library/python-2/pyasn1-modules-27
+library/python/pyasn1-26
+library/python/pyasn1-27
+library/python/pyasn1-modules-26
+library/python/pyasn1-modules-27
runtime/python-26
runtime/python-27
system/library
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/python26/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/tkinter-26
--- 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
--- a/components/python/python26/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/python26/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -5,6 +5,7 @@
library/libffi
library/ncurses
library/python-2/tkinter-26
+library/python/tkinter-26
library/readline
library/security/openssl
library/zlib
--- a/components/python/python26/tkinter-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/python26/tkinter-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,12 +18,12 @@
#
# 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>
set name=pkg.fmri \
- value=pkg:/library/python-2/tkinter-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/tkinter-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings to tcl/tk"
set name=com.oracle.info.description value="Python 2.6 bindings for Tcl/Tk"
set name=com.oracle.info.tpno value=$(TPNO)
@@ -31,18 +31,16 @@
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/lib
-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/lib/python2.6/lib-tk
-
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+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/_tkinter.so
file path=usr/lib/python2.6/lib-dynload/_tkinter.so
+dir path=usr/lib/python2.6/lib-tk
file path=usr/lib/python2.6/lib-tk/Canvas.py
file path=usr/lib/python2.6/lib-tk/Dialog.py
file path=usr/lib/python2.6/lib-tk/FileDialog.py
@@ -61,3 +59,7 @@
file path=usr/lib/python2.6/lib-tk/tkSimpleDialog.py
file path=usr/lib/python2.6/lib-tk/turtle.py
license python26.license license=PSFv2
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/python27/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/python27/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -6,6 +6,7 @@
library/libffi
library/ncurses
library/python-2/pip-27
+library/python/pip-27
library/readline
library/security/openssl
library/zlib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytz/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytz-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytz/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytz-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytz/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/pytz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pytz/pytz-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/pytz/pytz-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/pytz/pytz-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/pytz-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/pytz-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python time zone library"
set name=pkg.description \
value="This library allows accurate and cross-platform timezone calculations using Python 2.4 or higher and provides access to the Olson timezone database. It also solves the issue of ambiguous times at the end of daylight savings."
@@ -51,13 +51,17 @@
#
license LICENSE.txt license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/pytz-$(PYV)@2013.4,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the pytz package
depend type=require \
- fmri=library/python-2/pytz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/pytz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# Pull in the timezone database
depend type=require fmri=system/data/timezone
--- a/components/python/quantumclient/quantumclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/quantumclient/quantumclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -65,13 +65,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/quantumclient/version.py
license quantumclient.license license="Apache v2.0"
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pbr-$(PYV)
-
# force a dependency on neutronclient; pkgdepend work is needed to flush this
# out.
depend type=require fmri=library/python/neutronclient-$(PYV)
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
# force a dependency on the quantumclient package
depend type=require \
fmri=library/python/quantumclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/repoze.lru/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/repoze.lru-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/repoze.lru/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/repoze.lru-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/repoze.lru/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/repoze.lru
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/repoze.lru/repoze.lru-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/repoze.lru/repoze.lru-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/repoze.lru/repoze.lru-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/repoze.lru-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/repoze.lru-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A tiny LRU cache implementation and decorator for Python"
set name=pkg.description \
@@ -50,10 +50,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/repoze/lru/tests.py
license repoze.lru.license license=BSD-like
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/repoze.lru-$(PYV)@0.6,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the repoze.lru package
depend type=require \
- fmri=library/python-2/repoze.lru@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/repoze.lru@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/requests/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/requests-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/requests/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/requests-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/requests/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/requests
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/requests/requests-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/requests/requests-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/requests/requests-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/requests-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/requests-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python HTTP for Humans."
set name=pkg.description \
value="The Python requests module is an HTTP library, for human beings. It allow you to send HTTP/1.1 requests. You can add headers, form data, multipart files, and parameters with simple Python dictionaries, and access the response data in the same way. It's powered by httplib and urllib3."
@@ -110,13 +110,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/requests/utils.py
license requests.license license="Apache v2.0, MIT, LGPLv2.1"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/requests-$(PYV)@1.2.3,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on pyopenssl; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pyopenssl-$(PYV)
+depend type=require fmri=library/python/pyopenssl-$(PYV)
# force a dependency on the requests package
depend type=require \
- fmri=library/python-2/requests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/requests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/routes/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/routes-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/routes/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/routes-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/routes/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/routes
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/routes/routes-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/routes/routes-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/routes/routes-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/routes-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/routes-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="A routing package for Python that matches URLs to dicts and vice versa"
set name=pkg.description \
@@ -50,16 +50,20 @@
file path=usr/lib/python$(PYVER)/vendor-packages/routes/util.py
license routes.license license="BSD, MIT"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/routes-$(PYV)@1.13,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force dependency on repoze.lru; pkgdepend work is needed to flush these out.
-depend type=require fmri=library/python-2/repoze.lru-$(PYV)
+depend type=require fmri=library/python/repoze.lru-$(PYV)
# force a dependency on the routes package
depend type=require \
- fmri=library/python-2/routes@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/routes@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force dependency on webob; pkgdepend work is needed to flush these out.
-depend type=require fmri=library/python-2/webob-$(PYV)
+depend type=require fmri=library/python/webob-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools-git/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/setuptools-git-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools-git/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/setuptools-git-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools-git/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/setuptools-git
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools-git/setuptools-git-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/setuptools-git/setuptools-git-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/setuptools-git/setuptools-git-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/setuptools-git-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/setuptools-git-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Setuptools revision control system plugin for Git"
set name=pkg.description \
value="setuptools-git is a plugin for setuptools that enables git integration. Once installed, setuptools can be told to include in a package distribution all the files tracked by git."
@@ -48,10 +48,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/setuptools_git/utils.py
license LICENSE.txt license=BSD
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/setuptools-git-$(PYV)@1.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the setuptools-git package
depend type=require \
- fmri=library/python-2/setuptools-git@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/setuptools-git@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/setuptools-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/setuptools-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/setuptools/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/setuptools
--- a/components/python/setuptools/setuptools-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/setuptools/setuptools-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,9 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
legacy pkg=SUNWpython-setuptools \
desc="Download, build, install, upgrade, and uninstall Python packages easily" \
- name="setuptools"
+ name=setuptools
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/setuptools/setuptools-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/setuptools/setuptools-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,75 +18,78 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/setuptools-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="Download, build, install, upgrade, and uninstall Python packages easily"
-set name=com.oracle.info.tpno value=$(TPNO)
+set name=pkg.fmri \
+ value=pkg:/library/python/setuptools-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+ value="Download, build, install, upgrade, and uninstall Python packages easily"
set name=com.oracle.info.description value="Python setup tools"
-set name=info.classification value="org.opensolaris.category.2008:Development/Python"
-set name=info.upstream-url value="http://pypi.python.org/pypi/setuptools"
+set name=com.oracle.info.tpno value=$(TPNO)
+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://pypi.python.org/pypi/setuptools
+set name=org.opensolaris.arc-caseid value=PSARC/2008/084
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/084
-
+link path=usr/bin/easy_install target=easy_install-$(PYVER) mediator=python \
+ mediator-version=$(PYVER)
+file path=usr/bin/easy_install-$(PYVER)
+file path=usr/lib/python$(PYVER)/vendor-packages/easy_install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pkg_resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/PKG-INFO
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/SOURCES.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/entry_points.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/top_level.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/archive_util.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/cli.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/alias.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_egg.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_rpm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_wininst.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_ext.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_py.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/develop.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/easy_install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/egg_info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_egg_info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_lib.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_scripts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/register.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/rotate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/saveopts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/sdist.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/setopt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/test.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/upload.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/depends.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/dist.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/extension.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/gui.exe
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/package_index.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/sandbox.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/doctest.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_packageindex.py
+file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_resources.py
+file path=usr/lib/python$(PYVER)/vendor-packages/site.py
license setuptools.copyright license="PSF, ZPL"
-file path=usr/lib/python$(PYVER)/vendor-packages/easy_install.py
-file path=usr/lib/python$(PYVER)/vendor-packages/site.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pkg_resources.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/SOURCES.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/PKG-INFO
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/entry_points.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/dependency_links.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools-0.6c11-py$(PYVER).egg-info/top_level.txt
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/sandbox.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/extension.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/package_index.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/depends.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/gui.exe
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/archive_util.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/dist.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/cli.exe
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/register.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/setopt.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/saveopts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_py.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_egg.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/develop.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/build_ext.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/upload.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/easy_install.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/test.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/rotate.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/sdist.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_lib.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_egg_info.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/egg_info.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_wininst.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/alias.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/bdist_rpm.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/command/install_scripts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_packageindex.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/test_resources.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/setuptools/tests/doctest.py
-file path=usr/bin/easy_install-$(PYVER)
-link path=usr/bin/easy_install target=easy_install-$(PYVER) \
- mediator=python mediator-version=$(PYVER)
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/setuptools-$(PYV)@0.6.11,5.11-0.175.3.0.0.16.0
# force a dependency on the Python $(PYVER) runtime
-depend fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
+ pkg.debug.depend.path=usr/bin
# force a dependency on the setuptools package
-depend fmri=library/python-2/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
-
+depend type=require \
+ fmri=library/python/setuptools@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/simplejson/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/simplejson-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/simplejson/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/simplejson-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/simplejson/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/simplejson
--- a/components/python/simplejson/simplejson-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/simplejson/simplejson-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# simplejson was previously in the 'desktop' consolidation. This optional
@@ -28,3 +28,7 @@
# to the 'userland' consolidation.
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/simplejson/simplejson-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/simplejson/simplejson-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,11 +20,11 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/simplejson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/simplejson-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="JSON (Java Script Object Notation) encoder/decoder for Python"
set name=com.oracle.info.description value="the JSON encoder/decoder for Python"
@@ -76,10 +76,14 @@
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/simplejson-$(PYV)@2.1.2,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the simplejson package
depend type=require \
- fmri=library/python-2/simplejson@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/simplejson@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy-migrate/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/sqlalchemy-migrate-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy-migrate/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/sqlalchemy-migrate-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy-migrate/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/sqlalchemy-migrate
--- a/components/python/sqlalchemy-migrate/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/sqlalchemy-migrate/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -7,5 +7,14 @@
library/python-2/sqlalchemy-26
library/python-2/sqlalchemy-27
library/python-2/unittest2-26
+library/python/decorator-26
+library/python/decorator-27
+library/python/nose-26
+library/python/nose-27
+library/python/setuptools-26
+library/python/setuptools-27
+library/python/sqlalchemy-26
+library/python/sqlalchemy-27
+library/python/unittest2-26
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy-migrate/sqlalchemy-migrate-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/sqlalchemy-migrate/sqlalchemy-migrate-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/sqlalchemy-migrate/sqlalchemy-migrate-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,13 +18,13 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
# These template files would be processed by pkgdepend, but shouldn't be.
<transform file path=.*\.py_tmpl -> add pkg.depend.bypass-generate .*>
set name=pkg.fmri \
- value=pkg:/library/python-2/sqlalchemy-migrate-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/sqlalchemy-migrate-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Database schema migration for SQLAlchemy"
set name=pkg.description \
value="Inspired by Ruby on Rails' migrations, Migrate provides a way to deal with database schema changes in SQLAlchemy projects. Migrate extends SQLAlchemy to have database changeset handling. It provides a database change repository mechanism which can be used from the command line as well as from inside Python code."
@@ -153,9 +153,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/sqlalchemy_migrate-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
license sqlalchemy-migrate.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/sqlalchemy-migrate-$(PYV)@0.7.2,5.11-0.175.3.0.0.16.0
+
# force a dependency on the sqlalchemy-migrate package
depend type=require \
- fmri=library/python-2/sqlalchemy-migrate@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/sqlalchemy-migrate@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force dependency on tempita; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/tempita-$(PYV)
+depend type=require fmri=library/python/tempita-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/sqlalchemy-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/sqlalchemy-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/sqlalchemy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/sqlalchemy/sqlalchemy-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/sqlalchemy/sqlalchemy-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/sqlalchemy/sqlalchemy-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/sqlalchemy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/sqlalchemy-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="The Python SQL toolkit and Object Relational Mapper"
set name=pkg.description \
value="SQLAlchemy is the Python SQL toolkit and Object Relational Mapper (ORM) that gives application developers the full power and flexibility of SQL. SQLAlchemy provides a full suite of well known enterprise-level persistence patterns, designed for efficient and high-performing database access, adapted into a simple and Pythonic domain language."
@@ -173,10 +173,14 @@
#
license sqlalchemy.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/sqlalchemy-$(PYV)@0.7.9,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the sqlalchemy package
depend type=require \
- fmri=library/python-2/sqlalchemy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/sqlalchemy@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/stevedore/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/stevedore-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/stevedore/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/stevedore-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/stevedore/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/stevedore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/stevedore/stevedore-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/stevedore/stevedore-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/stevedore/stevedore-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/stevedore-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/stevedore-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Manage dynamic plugins for Python applications"
set name=pkg.description \
value="Python makes loading code dynamically easy, allowing you to configure and extend your application by discovering and loading extensions ('plugins') at runtime. Many applications implement their own library for doing this, using __import__ or importlib. stevedore avoids creating yet another extension mechanism by building on top of setuptools entry points. The code for managing entry points tends to be repetitive, though, so stevedore provides manager classes for implementing common patterns for using dynamically loaded extensions."
@@ -68,10 +68,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/stevedore/tests/test_named.py
license LICENSE license="Apache v2.0"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/stevedore-$(PYV)@0.10,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the stevedore package
depend type=require \
- fmri=library/python-2/stevedore@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/stevedore@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/suds/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/suds-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/suds/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/suds-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/suds/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/suds
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/suds/suds-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/suds/suds-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/suds/suds-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/suds-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/suds-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Lightweight SOAP client"
set name=pkg.description \
value="The Python suds module is a lightweight SOAP-based client, providing an RPC-like interface into SOAP-based web services. This means that in most cases, users do not need to be concerned with the complexities of the WSDL and referenced schemas. Regardless of which SOAP message style is specified, the signature of the service methods remain the same."
@@ -96,10 +96,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/suds/xsd/sxbuiltin.py
license LICENSE license=LGPLv3
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/suds-$(PYV)@0.4,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the suds package
depend type=require \
- fmri=library/python-2/suds@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/suds@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/swiftclient/swiftclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/swiftclient/swiftclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -61,10 +61,6 @@
file path=usr/lib/python$(PYVER)/vendor-packages/swiftclient/version.py
license swiftclient.license license="Apache v2.0"
-# force a group dependency on the optional simplejson; pkgdepend work is
-# needed to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
-
# force a group dependency on the optional keystoneclient; pkgdepend work is
# needed to flush this out.
depend type=group fmri=library/python/keystoneclient-$(PYV)
@@ -73,11 +69,15 @@
# flush this out.
depend type=group fmri=library/python/pbr-$(PYV)
+# force a group dependency on the optional simplejson; pkgdepend work is
+# needed to flush this out.
+depend type=group fmri=library/python/simplejson-$(PYV)
+
# force a dependency on requests; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/requests-$(PYV)
+depend type=require fmri=library/python/requests-$(PYV)
# force a dependency on setuptools; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/setuptools-$(PYV)
+depend type=require fmri=library/python/setuptools-$(PYV)
# force a dependency on the swiftclient package
depend type=require \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tempita/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/tempita-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tempita/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/tempita-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tempita/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/tempita
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tempita/tempita-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/tempita/tempita-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/tempita/tempita-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/tempita-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/tempita-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A very small text templating language"
set name=pkg.description \
value="Tempita is a small Python templating language for text substitution, that can be used when your project outgrows string.Template or % substitution."
@@ -45,10 +45,14 @@
file path=usr/lib/python$(PYVER)/vendor-packages/tempita/compat3.py
license tempita.license license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/tempita-$(PYV)@0.5.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the tempita package
depend type=require \
- fmri=library/python-2/tempita@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/tempita@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tox/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/tox-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tox/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/tox-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tox/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/tox
--- a/components/python/tox/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/tox/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -5,5 +5,12 @@
library/python-2/pytest-27
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/argparse-26
+library/python/py-26
+library/python/py-27
+library/python/pytest-26
+library/python/pytest-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/tox/tox-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/tox/tox-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/tox/tox-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/tox-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/tox-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="virtualenv-based automation of test activities"
set name=pkg.description \
value="Tox as is a generic virtualenv management and test command line tool you can use for: checking your package installs correctly with different Python versions and interpreters; running your tests in each of the environments; configuring your test tool of choice; acting as a frontend to Continuous Integration servers, greatly reducing boilerplate and merging CI and shell-based testing."
@@ -57,15 +57,19 @@
file path=usr/lib/python$(PYVER)/vendor-packages/tox/_verlib.py
license tox.license license="GPLv2 BSD, MIT, PSF"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/tox-$(PYV)@1.4.3,5.11-0.175.3.0.0.16.0
+
# force a dependency on argparse; pkgdepend work is needed to flush this out.
-$(PYTHON_2.6_ONLY)depend type=require fmri=library/python-2/argparse-26
+$(PYTHON_2.6_ONLY)depend type=require fmri=library/python/argparse-26
# force a dependency on py; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/py-$(PYV)
+depend type=require fmri=library/python/py-$(PYV)
# force a dependency on pytest; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pytest-$(PYV)
+depend type=require fmri=library/python/pytest-$(PYV)
# force a dependency on the tox package
depend type=require \
- fmri=library/python-2/tox@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/tox@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/troveclient/troveclient-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/troveclient/troveclient-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
@@ -83,13 +83,13 @@
# force a group dependency on simplejson; pkgdepend work is needed
# to flush this out.
-depend type=group fmri=library/python-2/simplejson-$(PYV)
+depend type=group fmri=library/python/simplejson-$(PYV)
# force a dependency on httplib2; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/httplib2-$(PYV)
+depend type=require fmri=library/python/httplib2-$(PYV)
# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-$(PYV)
+depend type=require fmri=library/python/lxml-$(PYV)
# force a dependency on the troveclient package
depend type=require \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/twisted-web2/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-twisted-web2-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/twisted-web2/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-twisted-web2-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/twisted-web2/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-twisted-web2
--- a/components/python/twisted-web2/twisted-web2-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/twisted-web2/twisted-web2-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# twisted-web2 was previously in the 'desktop' consolidation. This optional
@@ -28,3 +28,7 @@
# to the 'userland' consolidation.
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/twisted-web2/twisted-web2-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/twisted-web2/twisted-web2-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,13 +20,14 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/python-twisted-web2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/python-twisted-web2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="A HTTP/1.1 Server Framework"
-set name=com.oracle.info.description value="the Twisted Web2 Python HTTP/1.1 Server Framework"
+set name=com.oracle.info.description \
+ value="the Twisted Web2 Python HTTP/1.1 Server Framework"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
@@ -107,11 +108,15 @@
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/python-twisted-web2-$(PYV)@8.1.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
-depend type=require fmri=library/python-2/python-twisted-$(PYV)
+depend type=require fmri=library/python/python-twisted-$(PYV)
# force a dependency on the python-twisted-web2 package
depend type=require \
- fmri=library/python-2/python-twisted-web2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/python-twisted-web2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/twisted/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-twisted-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/twisted/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-twisted-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/twisted/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-twisted
--- a/components/python/twisted/twisted-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/twisted/twisted-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# twisted was previously in the 'desktop' consolidation. This optional
@@ -28,3 +28,7 @@
# to the 'userland' consolidation.
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/twisted/twisted-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/twisted/twisted-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,13 +20,14 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/python-twisted-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/python-twisted-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Event-based framework for internet applications"
-set name=com.oracle.info.description value="the Twisted event-based Python framework"
+set name=com.oracle.info.description \
+ value="the Twisted event-based Python framework"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
@@ -917,11 +918,15 @@
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/python-twisted-$(PYV)@10.1.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the python-twisted package
depend type=require \
- fmri=library/python-2/python-twisted@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-depend type=require fmri=library/python-2/python-zope-interface-$(PYV)
+ fmri=library/python/python-twisted@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+depend type=require fmri=library/python/python-zope-interface-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/unittest2/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/unittest2-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/unittest2/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/unittest2
--- a/components/python/unittest2/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/unittest2/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,2 +1,3 @@
library/python-2/setuptools-26
+library/python/setuptools-26
runtime/python-26
--- a/components/python/unittest2/unittest2-26.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/unittest2/unittest2-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/unittest2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/unittest2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python unit testing framework"
set name=pkg.description \
value="Many new features were added to unittest in Python 2.7, including test discovery. unittest2 allows you to use these features with earlier versions of Python."
@@ -57,6 +57,10 @@
file path=usr/lib/python2.6/vendor-packages/unittest2/util.py
license license.txt license="BSD, PSF"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+
# force a dependency on the unittest2 package
depend type=require \
- fmri=library/python-2/unittest2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/unittest2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/unittest2/unittest2.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/unittest2/unittest2.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/unittest2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/unittest2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python unit testing framework"
set name=pkg.description \
value="Many new features were added to unittest in Python 2.7, including test discovery. unittest2 allows you to use these features with earlier versions of Python."
@@ -36,5 +36,8 @@
set name=org.opensolaris.arc-caseid value=PSARC/2012/XXX
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
depend type=conditional \
- fmri=library/python-2/unittest2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ fmri=library/python/unittest2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
predicate=runtime/python-26
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/virtualenv/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/virtualenv-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/virtualenv/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/virtualenv-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/virtualenv/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/virtualenv
--- a/components/python/virtualenv/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/virtualenv/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/virtualenv/virtualenv-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/virtualenv/virtualenv-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/virtualenv/virtualenv-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/virtualenv-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/virtualenv-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Virtual Python Environment builder"
set name=pkg.description \
value="virtualenv is a tool to create isolated Python environments. It creates an environment that has its own installation directories, that doesn't share libraries with other virtualenv environments (and optionally doesn't access the globally installed libraries either)."
@@ -51,6 +51,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/virtualenv_support/setuptools-0.6c11-py$(PYVER).egg
license virtualenv.license license="MIT, LGPLv2.1, PSF, ZPL"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/virtualenv-$(PYV)@1.9.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the virtualenv package
depend type=require \
- fmri=library/python-2/virtualenv@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/virtualenv@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/waitress/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/waitress-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/waitress/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/waitress-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/waitress/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/waitress
--- a/components/python/waitress/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/waitress/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/waitress/waitress-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/waitress/waitress-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/waitress/waitress-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/waitress-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/waitress-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Waitress WSGI server"
set name=pkg.description \
value="Waitress is meant to be a production-quality pure-Python WSGI server with very acceptable performance. It has no dependencies except ones which live in the Python standard library. It supports HTTP/1.0 and HTTP/1.1."
@@ -58,6 +58,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/waitress/utilities.py
license waitress.license license=ZPL
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/waitress-$(PYV)@0.8.5,5.11-0.175.3.0.0.16.0
+
# force a dependency on the waitress package
depend type=require \
- fmri=library/python-2/waitress@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/waitress@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/warlock/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/warlock-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/warlock/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/warlock-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/warlock/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/warlock
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/warlock/warlock-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/warlock/warlock-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/warlock/warlock-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/warlock-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/warlock-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Python object model built on JSON Schema and JSON Patch"
set name=pkg.description \
@@ -50,10 +50,14 @@
#
license warlock.license license=Apache
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/warlock-$(PYV)@1.0.1,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the warlock package
depend type=require \
- fmri=library/python-2/warlock@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/warlock@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webob/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/webob-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webob/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/webob-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webob/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/webob
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webob/webob-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/webob/webob-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/webob/webob-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/webob-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/webob-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="WSGI request and response objects"
set name=pkg.description \
value="WebOb provides wrappers around the WSGI request environment, and an object to help create WSGI responses. The objects map much of the specified behavior of HTTP, including header parsing, content negotiation, and correct handling of conditional and range requests. This helps you create rich applications and valid middleware without knowing all the complexities of WSGI and HTTP."
@@ -61,13 +61,17 @@
file path=usr/lib/python$(PYVER)/vendor-packages/webob/util.py
license docs/license.txt license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/webob-$(PYV)@1.2.3,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on paste; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/paste-$(PYV)
+depend type=require fmri=library/python/paste-$(PYV)
# force a dependency on the webob package
depend type=require \
- fmri=library/python-2/webob@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/webob@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/websockify/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/websockify/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,4 +1,6 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webtest/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/webtest-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webtest/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/webtest-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webtest/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/webtest
--- a/components/python/webtest/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/webtest/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -11,5 +11,18 @@
library/python-2/waitress-27
library/python-2/webob-26
library/python-2/webob-27
+library/python/beautifulsoup4-26
+library/python/beautifulsoup4-27
+library/python/lxml-26
+library/python/lxml-27
+library/python/ordereddict-26
+library/python/paste.deploy-26
+library/python/paste.deploy-27
+library/python/six-26
+library/python/six-27
+library/python/waitress-26
+library/python/waitress-27
+library/python/webob-26
+library/python/webob-27
runtime/python-26
runtime/python-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/webtest/webtest-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/webtest/webtest-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/webtest/webtest-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,11 +18,11 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/webtest-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/webtest-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Helper to test WSGI applications"
set name=pkg.description \
value="The Python webtest module wraps any WSGI application and makes it easy to send test requests to that application, without starting up an HTTP server."
@@ -55,33 +55,37 @@
file path=usr/lib/python$(PYVER)/vendor-packages/webtest/utils.py
license docs/license.txt license=MIT
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/webtest-$(PYV)@2.0.6,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on beautifulsoup4; pkgdepend work is needed to flush this
# out.
-depend type=require fmri=library/python-2/beautifulsoup4-$(PYV)
+depend type=require fmri=library/python/beautifulsoup4-$(PYV)
# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/lxml-$(PYV)
+depend type=require fmri=library/python/lxml-$(PYV)
# force a dependency on ordereddict; pkgdepend work is needed to flush this out.
-$(PYTHON_2.6_ONLY)depend type=require fmri=library/python-2/ordereddict-26
+$(PYTHON_2.6_ONLY)depend type=require fmri=library/python/ordereddict-26
# force a dependency on paste.deploy; pkgdepend work is needed to flush this
# out.
-depend type=require fmri=library/python-2/paste.deploy-$(PYV)
+depend type=require fmri=library/python/paste.deploy-$(PYV)
# force a dependency on six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/six-$(PYV)
+depend type=require fmri=library/python/six-$(PYV)
# force a dependency on waitress; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/waitress-$(PYV)
+depend type=require fmri=library/python/waitress-$(PYV)
# force a dependency on webob; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/webob-$(PYV)
+depend type=require fmri=library/python/webob-$(PYV)
# force a dependency on the webtest package
depend type=require \
- fmri=library/python-2/webtest@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/webtest@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/python/xattr/resolve.deps Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/xattr/resolve.deps Wed Jan 28 08:53:43 2015 -0800
@@ -1,5 +1,7 @@
library/python-2/setuptools-26
library/python-2/setuptools-27
+library/python/setuptools-26
+library/python/setuptools-27
runtime/python-26
runtime/python-27
system/library
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/zope-interface/old-manifest-26.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-zope-interface-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/zope-interface/old-manifest-27.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-zope-interface-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/zope-interface/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/python-zope-interface
--- a/components/python/zope-interface/zope-interface-GENFRAG.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/zope-interface/zope-interface-GENFRAG.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,10 +20,15 @@
#
#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
# python-zope-interface was previously in the 'desktop' consolidation. This
# optional dependency is here to facilitate the safe transfer of the package
# to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+depend type=optional \
+ fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0
--- a/components/python/zope-interface/zope-interface-PYVER.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/python/zope-interface/zope-interface-PYVER.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -20,14 +20,14 @@
#
#
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
#
set name=pkg.fmri \
- value=pkg:/library/python-2/python-zope-interface-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
- value="Zope interfaces package for Python"
-set name=com.oracle.info.description value="the Zope interfaces package for Python"
+ value=pkg:/library/python/python-zope-interface-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Zope interfaces package for Python"
+set name=com.oracle.info.description \
+ value="the Zope interfaces package for Python"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Development/Python
@@ -98,10 +98,14 @@
depend type=optional \
fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/python-zope-interface-$(PYV)@3.3.0,5.11-0.175.3.0.0.16.0
+
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
pkg.debug.depend.path=usr/bin
# force a dependency on the python-zope-interface package
depend type=require \
- fmri=library/python-2/python-zope-interface@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/python-zope-interface@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/subversion/old-manifest.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.3.0.0.16.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/subversion
--- a/components/subversion/subversion-python.p5m Wed Jan 28 11:07:54 2015 -0800
+++ b/components/subversion/subversion-python.p5m Wed Jan 28 08:53:43 2015 -0800
@@ -18,26 +18,27 @@
#
# 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.
#
-set name=pkg.fmri value=pkg:/library/python-2/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.description value="Python bindings for the Subversion SCM"
+set name=com.oracle.info.description \
+ value="Python bindings for the Subversion SCM"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+ value="org.opensolaris.category.2008:Development/Source Code Management"
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2006/563
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/563
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/python2.6
-dir path=usr/lib/python2.6/vendor-packages
-dir path=usr/lib/python2.6/vendor-packages/libsvn
-dir path=usr/lib/python2.6/vendor-packages/svn
-dir path=usr/lib/svn
+dir path=usr
+dir path=usr/lib
+dir path=usr/lib/python2.6
+dir path=usr/lib/python2.6/vendor-packages
+dir path=usr/lib/python2.6/vendor-packages/libsvn
+file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.py
#
file path=usr/lib/python2.6/vendor-packages/libsvn/_client.so
file path=usr/lib/python2.6/vendor-packages/libsvn/_core.so
@@ -55,7 +56,8 @@
file path=usr/lib/python2.6/vendor-packages/libsvn/ra.py
file path=usr/lib/python2.6/vendor-packages/libsvn/repos.py
file path=usr/lib/python2.6/vendor-packages/libsvn/wc.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.py
+dir path=usr/lib/python2.6/vendor-packages/svn
+file path=usr/lib/python2.6/vendor-packages/svn/__init__.py
file path=usr/lib/python2.6/vendor-packages/svn/client.py
file path=usr/lib/python2.6/vendor-packages/svn/core.py
file path=usr/lib/python2.6/vendor-packages/svn/delta.py
@@ -64,10 +66,14 @@
file path=usr/lib/python2.6/vendor-packages/svn/ra.py
file path=usr/lib/python2.6/vendor-packages/svn/repos.py
file path=usr/lib/python2.6/vendor-packages/svn/wc.py
-file path=usr/lib/python2.6/vendor-packages/svn/__init__.py
-file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0
+dir path=usr/lib/svn
+link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0
#
link path=usr/lib/svn/libsvn_swig_py-1.so.0 target=libsvn_swig_py-1.so.0.0.0
-link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0
+file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0
#
license subversion.license license="Apache v2.0"
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0