equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 # twisted was previously in the 'desktop' consolidation. This optional |
26 # twisted was previously in the 'desktop' consolidation. This optional |
27 # dependency is here to facilitate the safe transfer of the package |
27 # dependency is here to facilitate the safe transfer of the package |
28 # to the 'userland' consolidation. |
28 # to the 'userland' consolidation. |
29 depend type=optional \ |
29 depend type=optional \ |
30 fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0 |
30 fmri=consolidation/desktop/[email protected],5.11-0.175.2.0.0.20.0 |
|
31 |
|
32 # force the rename with an optional dependency on the old name |
|
33 depend type=optional \ |
|
34 fmri=library/python-2/[email protected],5.11-0.175.3.0.0.16.0 |