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