equal
deleted
inserted
replaced
15 # If applicable, add the following below this CDDL HEADER, with the |
15 # If applicable, add the following below this CDDL HEADER, with the |
16 # fields enclosed by brackets "[]" replaced with your own identifying |
16 # fields enclosed by brackets "[]" replaced with your own identifying |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
17 # information: Portions Copyright [yyyy] [name of copyright owner] |
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
|
20 # |
|
21 |
20 # |
22 # |
21 # Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. |
22 # |
24 # |
23 |
25 |
24 set name=pkg.fmri \ |
26 set name=pkg.fmri \ |
59 |
61 |
60 # force the rename with an optional dependency on the old name |
62 # force the rename with an optional dependency on the old name |
61 depend type=optional fmri=library/python-2/tox-$(PYV)@1.4.3,5.12-5.12.0.0.0.41.0 |
63 depend type=optional fmri=library/python-2/tox-$(PYV)@1.4.3,5.12-5.12.0.0.0.41.0 |
62 |
64 |
63 # force a dependency on argparse; pkgdepend work is needed to flush this out. |
65 # force a dependency on argparse; pkgdepend work is needed to flush this out. |
64 $(PYTHON_2.6_ONLY)depend type=require fmri=library/python/argparse-26 |
66 depend type=require fmri=library/python/argparse-$(PYV) |
65 |
67 |
66 # force a dependency on py; pkgdepend work is needed to flush this out. |
68 # force a dependency on py; pkgdepend work is needed to flush this out. |
67 depend type=require fmri=library/python/py-$(PYV) |
69 depend type=require fmri=library/python/py-$(PYV) |
68 |
70 |
69 # force a dependency on pytest; pkgdepend work is needed to flush this out. |
71 # force a dependency on pytest; pkgdepend work is needed to flush this out. |