--- a/components/subversion/subversion-python.p5m Mon Sep 30 23:01:23 2013 -0700
+++ b/components/subversion/subversion-python.p5m Tue Oct 01 12:41:40 2013 -0700
@@ -20,19 +20,48 @@
#
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/library/python-2/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/python-2/subversion@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.description value="Python bindings for the Subversion SCM"
-set name=com.oracle.info.tpno value=9086
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2006/563
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
# This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
+set name=pkg.linted.pkglint.manifest004 value=true
+set name=com.oracle.info.description \
+ value="Python bindings for the Subversion SCM"
+set name=com.oracle.info.tpno value=9086
+set name=info.classification \
+ value="org.opensolaris.category.2008:Development/Source Code Management"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2006/563
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/__init__.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_client.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_core.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_delta.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_diff.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_fs.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_ra.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_repos.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/_wc.so
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/client.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/core.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/delta.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/diff.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/fs.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/ra.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/repos.py
+file path=usr/lib/python2.6/vendor-packages/64/libsvn/wc.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/__init__.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/client.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/core.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/delta.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/diff.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/fs.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/ra.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/repos.py
+file path=usr/lib/python2.6/vendor-packages/64/svn/wc.py
+file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.py
#
file path=usr/lib/python2.6/vendor-packages/libsvn/_client.so
@@ -51,7 +80,7 @@
file path=usr/lib/python2.6/vendor-packages/libsvn/ra.py
file path=usr/lib/python2.6/vendor-packages/libsvn/repos.py
file path=usr/lib/python2.6/vendor-packages/libsvn/wc.py
-file path=usr/lib/python2.6/vendor-packages/libsvn/__init__.py
+file path=usr/lib/python2.6/vendor-packages/svn/__init__.py
file path=usr/lib/python2.6/vendor-packages/svn/client.py
file path=usr/lib/python2.6/vendor-packages/svn/core.py
file path=usr/lib/python2.6/vendor-packages/svn/delta.py
@@ -60,44 +89,15 @@
file path=usr/lib/python2.6/vendor-packages/svn/ra.py
file path=usr/lib/python2.6/vendor-packages/svn/repos.py
file path=usr/lib/python2.6/vendor-packages/svn/wc.py
-file path=usr/lib/python2.6/vendor-packages/svn/__init__.py
-
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_client.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_core.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_delta.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_diff.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_fs.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_ra.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_repos.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/_wc.so
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/client.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/core.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/delta.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/diff.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/fs.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/ra.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/repos.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/wc.py
-file path=usr/lib/python2.6/vendor-packages/64/libsvn/__init__.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/client.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/core.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/delta.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/diff.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/fs.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/ra.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/repos.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/wc.py
-file path=usr/lib/python2.6/vendor-packages/64/svn/__init__.py
+link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so \
+ target=libsvn_swig_py-1.so.0.0.0
+link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0 \
+ target=libsvn_swig_py-1.so.0.0.0
+file path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0.0.0
+link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0
+#
+link path=usr/lib/svn/libsvn_swig_py-1.so.0 target=libsvn_swig_py-1.so.0.0.0
#
file path=usr/lib/svn/libsvn_swig_py-1.so.0.0.0
-file path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0.0.0
-#
-link path=usr/lib/svn/libsvn_swig_py-1.so.0 target=libsvn_swig_py-1.so.0.0.0
-link path=usr/lib/svn/libsvn_swig_py-1.so target=libsvn_swig_py-1.so.0.0.0
-
-link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so.0 \
- target=libsvn_swig_py-1.so.0.0.0
-link path=usr/lib/svn/$(MACH64)/libsvn_swig_py-1.so \
- target=libsvn_swig_py-1.so.0.0.0
#
license subversion.license license="Apache v2.0"