--- 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)