--- a/components/graphviz/graphviz-perl-PERLVER.p5m Tue Mar 22 14:21:50 2016 -0700
+++ b/components/graphviz/graphviz-perl-PERLVER.p5m Tue Mar 22 17:14:51 2016 -0700
@@ -37,7 +37,8 @@
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file path=usr/lib/$(MACH64)/graphviz/perl/gv.pm
link path=usr/lib/$(MACH64)/graphviz/perl/gv.so target=libgv_perl.so
-file path=usr/lib/$(MACH64)/graphviz/perl/libgv_perl.so
+file path=usr/lib/$(MACH64)/graphviz/perl/libgv_perl.so \
+ pkg.linted.userland.action001.3=true
link path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/gv.pm \
target=../../../../lib/$(MACH64)/graphviz/perl/gv.pm
link path=usr/perl5/vendor_perl/$(PERLVER)/$(PERL_ARCH)/gv.so \
@@ -51,3 +52,6 @@
# least the migrated version if installed.
depend type=optional \
fmri=image/graphviz/[email protected],5.12-5.12.0.0.0.87.0
+# perl 5.20 is EOF. Make sure this package goes away.
+depend type=optional \
+ fmri=image/graphviz/[email protected],5.12-5.12.0.0.0.96.0
--- a/components/graphviz/graphviz.p5m Tue Mar 22 14:21:50 2016 -0700
+++ b/components/graphviz/graphviz.p5m Tue Mar 22 17:14:51 2016 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -523,8 +523,8 @@
fmri=image/graphviz/graphviz-ocaml@$(IPS_COMPONENT_VERSION) \
predicate=runtime/ocaml
depend type=conditional \
- fmri=image/graphviz/graphviz-perl-520@$(IPS_COMPONENT_VERSION) \
- predicate=runtime/perl-520
+ fmri=image/graphviz/graphviz-perl-522@$(IPS_COMPONENT_VERSION) \
+ predicate=runtime/perl-522
depend type=conditional \
fmri=image/graphviz/graphviz-php@$(IPS_COMPONENT_VERSION) \
predicate=web/php-53
--- a/components/meta-packages/history/history Tue Mar 22 14:21:50 2016 -0700
+++ b/components/meta-packages/history/history Tue Mar 22 17:14:51 2016 -0700
@@ -877,8 +877,9 @@
image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
image/editor/gimp/locale/[email protected],5.11-0.175.0.0.0.0.0
-image/graphviz/[email protected],5.12-5.12.0.0.0.87.0 image/graphviz/[email protected],5.12-5.12.0.0.0.87.0
+image/graphviz/[email protected],5.12-5.12.0.0.0.96.0
image/graphviz/[email protected],5.12-5.12.0.0.0.81.0
+image/graphviz/[email protected],5.12-5.12.0.0.0.96.0
image/scanner/[email protected],5.12-5.12.0.0.0.90.0
image/viewer/[email protected],5.12-5.12.0.0.0.90.0
image/viewer/[email protected],5.12-5.12.0.0.0.90.0