--- a/components/meld/meld.p5m	Mon May 19 10:28:03 2014 +0100
+++ b/components/meld/meld.p5m	Mon May 19 07:37:20 2014 -0700
@@ -18,28 +18,30 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+<transform file hardlink path=usr/lib/.*\.py$ -> default pkg.tmp.pyversion 2.X>
+#
 set name=pkg.fmri \
     value=pkg:/developer/meld@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="meld - graphical diff and merge tool"
 set name=pkg.description \
     value="Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial."
-set name=pkg.summary value="meld - graphical diff and merge tool"
-set name=com.oracle.info.description value="the meld graphical diff and merge tool"
+set name=com.oracle.info.description \
+    value="the meld graphical diff and merge tool"
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 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/2008/189
+set name=org.opensolaris.arc-caseid value=PSARC/2008/189
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/meld \
-	pkg.depend.runpath=/usr/lib/meld:/usr/lib/python2.6:/usr/lib/python2.6/vendor-packages/gtk-2.0 \
-	pkg.depend.bypass-generate=.*/checker.* \
-	pkg.depend.bypass-generate=.*/pychecker/__init__.* \
-	pkg.depend.bypass-generate=.*/pygtk.*
+    pkg.depend.runpath=/usr/lib/meld:/usr/lib/python2.6:/usr/lib/python2.6/vendor-packages/gtk-2.0 \
+    pkg.depend.bypass-generate=.*/checker.* \
+    pkg.depend.bypass-generate=.*/pychecker/__init__.* \
+    pkg.depend.bypass-generate=.*/pygtk.*
 file path=usr/lib/meld/meld/__init__.py
 file path=usr/lib/meld/meld/diffmap.py
 file path=usr/lib/meld/meld/diffutil.py