--- a/components/python/cssutils/cssutils-PYVER.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/python/cssutils/cssutils-PYVER.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -20,7 +20,7 @@
#
#
-# 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 \
@@ -35,7 +35,7 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=LSARC/2008/658
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
+#
file path=usr/lib/python$(PYVER)/vendor-packages/cssutils-0.9.6-py$(PYVER).egg-info/PKG-INFO
file path=usr/lib/python$(PYVER)/vendor-packages/cssutils-0.9.6-py$(PYVER).egg-info/SOURCES.txt
file path=usr/lib/python$(PYVER)/vendor-packages/cssutils-0.9.6-py$(PYVER).egg-info/dependency_links.txt
@@ -125,8 +125,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/tests/test_tokenize2.py
file path=usr/lib/python$(PYVER)/vendor-packages/tests/test_util.py
file path=usr/lib/python$(PYVER)/vendor-packages/tests/test_x.py
+#
+license cssutils.license license="LGPL v3"
-license cssutils.license license="LGPL v3"
+# cssutils was previously in the 'desktop' consolidation. This optional
+# dependency is here to facilitate the safe transfer of the package
+# to the 'userland' consolidation.
+depend type=optional \
+ fmri=consolidation/desktop/[email protected]
+
+# force the rename with an optional dependency on the old name
+depend type=optional \
+ fmri=library/python-2/cssutils-$(PYV)@0.9.6,5.12-5.12.0.0.0.41.0
# force a dependency on the Python runtime
depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
@@ -135,12 +145,3 @@
# force a dependency on the cssutils package
depend type=require \
fmri=library/python/cssutils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-
-# cssutils was previously in the 'desktop' consolidation. This optional
-# dependency is here to facilitate the safe transfer of the package
-# to the 'userland' consolidation.
-depend type=optional fmri=consolidation/desktop/[email protected]
-
-# force the rename with an optional dependency on the old name
-depend type=optional \
- fmri=library/python-2/cssutils-$(PYV)@0.9.6,5.12-5.12.0.0.0.41.0