diff -r 9e945128be3b -r 69d14d547e77 components/logilab-astng/logilab-astng-26.p5m --- a/components/logilab-astng/logilab-astng-26.p5m Mon Jan 27 15:13:46 2014 -0800 +++ b/components/logilab-astng/logilab-astng-26.p5m Mon Jan 27 17:48:58 2014 -0800 @@ -18,13 +18,13 @@ # # CDDL HEADER END # -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # 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.description \ value="logilab-astng provides a common base representation of python source code for projects such as pylint." set name=pkg.summary \ @@ -78,12 +78,16 @@ license logilab-astng.license license=LGPLv2.1,GPLv2 # force a dependency on logilab-common version 0.58.2 -depend fmri=library/python-2/logilab-common-26@0.58.2 type=require +depend fmri=library/python/logilab-common-26@0.58.2 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 logilab-astng package -depend fmri=library/python-2/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \ +depend fmri=library/python/logilab-astng@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \ type=require + +# force the rename with an optional dependency on the old name +depend type=optional \ + fmri=library/python-2/logilab-astng-26@0.24.0,5.12-5.12.0.0.0.41.0