--- a/components/openstack/horizon/horizon.p5m Fri May 16 16:46:28 2014 -0700
+++ b/components/openstack/horizon/horizon.p5m Sat May 17 16:39:41 2014 -0700
@@ -780,7 +780,7 @@
pkg.debug.depend.path=usr/bin
# force dependency on django; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/django-26
+depend type=require fmri=library/python/django-26
# force dependency on django_compressor; one of the applications defined in
# settings.py
--- a/components/python/django-appconf/django-appconf-PYVER.p5m Fri May 16 16:46:28 2014 -0700
+++ b/components/python/django-appconf/django-appconf-PYVER.p5m Sat May 17 16:39:41 2014 -0700
@@ -52,7 +52,7 @@
pkg.debug.depend.path=usr/bin
# force a dependency on django; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/django-$(PYV)
+depend type=require fmri=library/python/django-$(PYV)
# force a dependency on the django-appconf package
depend type=require \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django/django-GENFRAG.p5m Sat May 17 16:39:41 2014 -0700
@@ -0,0 +1,27 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+# force the rename with an optional dependency on the old name
+depend type=optional fmri=library/python-2/[email protected],5.11-0.175.2.0.0.40.0
--- a/components/python/django/django-PYVER.p5m Fri May 16 16:46:28 2014 -0700
+++ b/components/python/django/django-PYVER.p5m Sat May 17 16:39:41 2014 -0700
@@ -24,7 +24,7 @@
# The functionality of unittest2 is part of python 2.7, but separate in 2.6
<transform depend type=require fmri=library/python-2/unittest2-27 -> drop>
set name=pkg.fmri \
- value=pkg:/library/python-2/django-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ value=pkg:/library/python/django-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Django Python web framework"
set name=pkg.description \
value="Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design."
@@ -2384,9 +2384,13 @@
file path=usr/lib/python$(PYVER)/vendor-packages/django/views/static.py
license django.license license="BSD, Apache 2.0, MIT, PSFv2"
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/django-$(PYV)@1.4.11,5.11-0.175.2.0.0.40.0
+
# force a dependency on the django package
depend type=require \
- fmri=library/python-2/django@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+ fmri=library/python/django@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
# force a dependency on ipython; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python-2/ipython-$(PYV)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django/old-manifest-26.p5m Sat May 17 16:39:41 2014 -0700
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.40.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django-26
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django/old-manifest-27.p5m Sat May 17 16:39:41 2014 -0700
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.40.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django-27
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/django/old-manifest.p5m Sat May 17 16:39:41 2014 -0700
@@ -0,0 +1,28 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+ value=pkg:/library/python-2/[email protected],5.11-0.175.2.0.0.40.0
+set name=pkg.renamed value=true
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+depend type=require fmri=library/python/django
--- a/components/python/django_compressor/django_compressor-PYVER.p5m Fri May 16 16:46:28 2014 -0700
+++ b/components/python/django_compressor/django_compressor-PYVER.p5m Sat May 17 16:39:41 2014 -0700
@@ -102,7 +102,7 @@
depend type=require fmri=library/python-2/beautifulsoup4-$(PYV)
# force a dependency on django; pkgdepend work is needed to flush this out
-depend type=require fmri=library/python-2/django-$(PYV)
+depend type=require fmri=library/python/django-$(PYV)
# force a dependency on django-appconf; pkgdepend work is needed to
# flush this out
--- a/components/python/django_openstack_auth/django_openstack_auth-PYVER.p5m Fri May 16 16:46:28 2014 -0700
+++ b/components/python/django_openstack_auth/django_openstack_auth-PYVER.p5m Sat May 17 16:39:41 2014 -0700
@@ -96,7 +96,7 @@
pkg.debug.depend.path=usr/bin
# force a dependency on django; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/django-$(PYV)
+depend type=require fmri=library/python/django-$(PYV)
# force a dependency on the django_openstack_auth package
depend type=require \