From 4158c02ccf09e2f646cf2e9e5599f186ec8c7302 Mon Sep 17 00:00:00 2001
From: Norm Jacobs <Norm.Jacobs@Oracle.COM>
Date: Wed, 13 Apr 2011 18:58:06 +0200
Subject: [PATCH] 7003927 userland should postprocess packaged files 7034188 userland should have common lint library rules 7034992 userland packages should include opensolaris.arc_url data 7019309 move ghostscript to userland (fix build)

---
 components/mercurial/mercurial.p5m |   97 +++++++++++++++++++++++++-----------------------
 1 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/components/mercurial/mercurial.p5m b/components/mercurial/mercurial.p5m
index 620bbd9..064c23f 100644
--- a/components/mercurial/mercurial.p5m
+++ b/components/mercurial/mercurial.p5m
@@ -21,16 +21,22 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-set name=pkg.fmri value=pkg:/developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+# These are not installed, but can be found in the source contrib directory.
+<transform file path=usr/demo/mercurial/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
+set name=pkg.fmri \
+    value=pkg:/developer/versioning/mercurial@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description \
+    value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
 set name=pkg.summary value="The Mercurial Source Control Management System"
-set name=pkg.description value="A fast, lightweight source control management system designed for efficient handling of very large distributed projects."
-set name=info.classification value="org.opensolaris.category.2008:Development/Source Code Management"
-set name=info.upstream_url value="http://www.selenic.com/mercurial/wiki/index.cgi/Mercurial"
+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=http://www.selenic.com/mercurial/wiki/index.cgi/Mercurial
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2006/417
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license mercurial.copyright license='GPLv2'
-
 dir path=usr
 dir path=usr/bin
 dir path=usr/demo
@@ -82,6 +88,41 @@
 dir path=usr/share/man/man1
 dir path=usr/share/man/man5
 file path=usr/bin/hg
+file path=usr/demo/mercurial/bash_completion
+file path=usr/demo/mercurial/convert-repo
+file path=usr/demo/mercurial/dumprevlog
+file path=usr/demo/mercurial/git-viz/git-cat-file
+file path=usr/demo/mercurial/git-viz/git-diff-tree
+file path=usr/demo/mercurial/git-viz/git-rev-list
+file path=usr/demo/mercurial/git-viz/git-rev-tree
+file path=usr/demo/mercurial/git-viz/hg-viz
+file path=usr/demo/mercurial/hg-relink mode=0555
+file path=usr/demo/mercurial/hg-ssh mode=0555
+file path=usr/demo/mercurial/hgdiff mode=0555
+file path=usr/demo/mercurial/hgk mode=0555
+file path=usr/demo/mercurial/hgsh/Makefile
+file path=usr/demo/mercurial/hgsh/hgsh.c
+file path=usr/demo/mercurial/hgwebdir.fcgi
+file path=usr/demo/mercurial/hgwebdir.wsgi
+file path=usr/demo/mercurial/logo-droplets.svg
+file path=usr/demo/mercurial/mercurial.el
+file path=usr/demo/mercurial/mergetools.hgrc
+file path=usr/demo/mercurial/mq.el
+file path=usr/demo/mercurial/perf.py
+file path=usr/demo/mercurial/python-hook-examples.py
+file path=usr/demo/mercurial/rewrite-log
+file path=usr/demo/mercurial/sample.hgrc
+file path=usr/demo/mercurial/simplemerge
+file path=usr/demo/mercurial/tcsh_completion
+file path=usr/demo/mercurial/tcsh_completion_build.sh
+file path=usr/demo/mercurial/tmplrewrite.py
+file path=usr/demo/mercurial/undumprevlog
+file path=usr/demo/mercurial/vim/HGAnnotate.vim
+file path=usr/demo/mercurial/vim/hg-menu.vim
+file path=usr/demo/mercurial/vim/hgcommand.vim
+file path=usr/demo/mercurial/vim/patchreview.txt
+file path=usr/demo/mercurial/vim/patchreview.vim
+file path=usr/demo/mercurial/zsh_completion
 file path=usr/lib/python2.6/vendor-packages/hgext/__init__.py
 file path=usr/lib/python2.6/vendor-packages/hgext/__init__.pyc
 file path=usr/lib/python2.6/vendor-packages/hgext/acl.py
@@ -320,7 +361,8 @@
 file path=usr/lib/python2.6/vendor-packages/mercurial/repo.pyc
 file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.py
 file path=usr/lib/python2.6/vendor-packages/mercurial/revlog.pyc
-file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py pkg.depend.bypass-generate=.*
+file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.py \
+    pkg.depend.bypass-generate=.*
 file path=usr/lib/python2.6/vendor-packages/mercurial/simplemerge.pyc
 file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.py
 file path=usr/lib/python2.6/vendor-packages/mercurial/sshrepo.pyc
@@ -587,47 +629,10 @@
 file path=usr/lib/python2.6/vendor-packages/mercurial/win32.pyc
 file path=usr/lib/python2.6/vendor-packages/mercurial/windows.py
 file path=usr/lib/python2.6/vendor-packages/mercurial/windows.pyc
-
-file path=usr/demo/mercurial/bash_completion
-file path=usr/demo/mercurial/convert-repo
-file path=usr/demo/mercurial/dumprevlog
-file path=usr/demo/mercurial/git-viz/git-cat-file
-file path=usr/demo/mercurial/git-viz/git-diff-tree
-file path=usr/demo/mercurial/git-viz/git-rev-list
-file path=usr/demo/mercurial/git-viz/git-rev-tree
-file path=usr/demo/mercurial/git-viz/hg-viz
-file path=usr/demo/mercurial/hg-relink mode=0555
-file path=usr/demo/mercurial/hg-ssh mode=0555
-file path=usr/demo/mercurial/hgdiff mode=0555
-file path=usr/demo/mercurial/hgk mode=0555
-file path=usr/demo/mercurial/hgsh/hgsh.c
-file path=usr/demo/mercurial/hgsh/Makefile
-file path=usr/demo/mercurial/hgwebdir.fcgi
-file path=usr/demo/mercurial/hgwebdir.wsgi
-file path=usr/demo/mercurial/logo-droplets.svg
-file path=usr/demo/mercurial/mercurial.el
-file path=usr/demo/mercurial/mergetools.hgrc
-file path=usr/demo/mercurial/mq.el
-file path=usr/demo/mercurial/perf.py
-file path=usr/demo/mercurial/python-hook-examples.py
-file path=usr/demo/mercurial/rewrite-log
-file path=usr/demo/mercurial/sample.hgrc
-file path=usr/demo/mercurial/simplemerge
-file path=usr/demo/mercurial/tcsh_completion
-file path=usr/demo/mercurial/tcsh_completion_build.sh
-file path=usr/demo/mercurial/tmplrewrite.py
-file path=usr/demo/mercurial/undumprevlog
-file path=usr/demo/mercurial/vim/hg-menu.vim
-file path=usr/demo/mercurial/vim/HGAnnotate.vim
-file path=usr/demo/mercurial/vim/hgcommand.vim
-file path=usr/demo/mercurial/vim/patchreview.txt
-file path=usr/demo/mercurial/vim/patchreview.vim
-file path=usr/demo/mercurial/zsh_completion
-
 file path=usr/share/man/man1/hg.1
 file path=usr/share/man/man5/hgignore.5
 file path=usr/share/man/man5/hgrc.5
-
 legacy pkg=SUNWmercurial \
     desc="A fast, lightweight source control management system designed for efficient handling of very large distributed projects." \
     name="The Mercurial Source Control Management System"
+license mercurial.copyright license=GPLv2

--
Gitblit v1.9.3