--- a/components/gutenprint/gutenprint.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/gutenprint/gutenprint.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,104 +18,31 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
<transform file path=usr/lib/cups/.+ ->default mode 0555>
-
set name=pkg.fmri \
value=pkg:/print/filter/gutenprint@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="Gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
-set name=com.oracle.info.description value="the Gutenprint drivers for Canon, Epson, Lexmark & PCL printers"
+set name=com.oracle.info.description \
+ value="the Gutenprint drivers for Canon, Epson, Lexmark & PCL printers"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
- value=org.opensolaris.category.2008:System/Printing
+set name=info.classification value=org.opensolaris.category.2008:System/Printing
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=LSARC/2009/469
+set name=org.opensolaris.arc-caseid value=LSARC/2009/469
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/gutenprint
-dir path=usr/include/gutenprintui2
-dir path=usr/lib
-dir path=usr/lib/cups
-dir path=usr/lib/cups/driver
-dir path=usr/lib/cups/filter
-dir path=usr/lib/cups/startup
-dir path=usr/lib/gutenprint
-dir path=usr/lib/gutenprint/5.2
-dir path=usr/lib/gutenprint/5.2/modules
-dir path=usr/lib/pkgconfig
-dir path=usr/sbin
-dir path=usr/share
-dir path=usr/share/cups
-dir path=usr/share/gutenprint
-dir path=usr/share/gutenprint/5.2
-dir path=usr/share/gutenprint/5.2/xml
-dir path=usr/share/gutenprint/5.2/xml/escp2
-dir path=usr/share/gutenprint/5.2/xml/escp2/inks
-dir path=usr/share/gutenprint/5.2/xml/escp2/inputslots
-dir path=usr/share/gutenprint/5.2/xml/escp2/media
-dir path=usr/share/gutenprint/5.2/xml/escp2/mediasizes
-dir path=usr/share/gutenprint/5.2/xml/escp2/model
-dir path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets
-dir path=usr/share/gutenprint/5.2/xml/escp2/weaves
-dir path=usr/share/gutenprint/doc
-dir path=usr/share/gutenprint/doc/reference-html
-dir path=usr/share/gutenprint/samples
-dir path=usr/share/locale
-dir path=usr/share/locale/cs
-dir path=usr/share/locale/cs/LC_MESSAGES
-dir path=usr/share/locale/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/el
-dir path=usr/share/locale/el/LC_MESSAGES
-dir path=usr/share/locale/en_GB
-dir path=usr/share/locale/en_GB/LC_MESSAGES
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/hu
-dir path=usr/share/locale/hu/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/nb
-dir path=usr/share/locale/nb/LC_MESSAGES
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/pt
-dir path=usr/share/locale/pt/LC_MESSAGES
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/ru/LC_MESSAGES
-dir path=usr/share/locale/sk
-dir path=usr/share/locale/sk/LC_MESSAGES
-dir path=usr/share/locale/sl
-dir path=usr/share/locale/sl/LC_MESSAGES
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/sv/LC_MESSAGES
-dir path=usr/share/locale/zh_TW
-dir path=usr/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man8
+dir path=usr
+dir path=usr/bin
file path=usr/bin/cups-calibrate
file path=usr/bin/escputil
file path=usr/bin/ijsgutenprint.5.2
file path=usr/bin/testpattern
+dir path=usr/include
+dir path=usr/include/gutenprint
file path=usr/include/gutenprint/array.h
file path=usr/include/gutenprint/bit-ops.h
file path=usr/include/gutenprint/channel.h
@@ -139,16 +66,25 @@
file path=usr/include/gutenprint/vars.h
file path=usr/include/gutenprint/weave.h
file path=usr/include/gutenprint/xml.h
+dir path=usr/include/gutenprintui2
file path=usr/include/gutenprintui2/curve.h
file path=usr/include/gutenprintui2/gammacurve.h
file path=usr/include/gutenprintui2/gutenprintui.h
file path=usr/include/gutenprintui2/typebuiltins.h
+dir path=usr/lib
+dir path=usr/lib/cups
+dir path=usr/lib/cups/driver
file path=usr/lib/cups/driver/gutenprint.5.2
+dir path=usr/lib/cups/filter
file path=usr/lib/cups/filter/commandtocanon
file path=usr/lib/cups/filter/commandtoepson
file path=usr/lib/cups/filter/rastertogutenprint.5.2
+dir path=usr/lib/cups/startup
file gutenprint.startup path=usr/lib/cups/startup/gutenprint \
- restart_fmri=svc:/application/cups/scheduler:default
+ restart_fmri=svc:/application/cups/scheduler:default
+dir path=usr/lib/gutenprint
+dir path=usr/lib/gutenprint/5.2
+dir path=usr/lib/gutenprint/5.2/modules
file path=usr/lib/gutenprint/5.2/modules/color-traditional.so
file path=usr/lib/gutenprint/5.2/modules/print-canon.so
file path=usr/lib/gutenprint/5.2/modules/print-dyesub.so
@@ -157,16 +93,29 @@
file path=usr/lib/gutenprint/5.2/modules/print-pcl.so
file path=usr/lib/gutenprint/5.2/modules/print-ps.so
file path=usr/lib/gutenprint/5.2/modules/print-raw.so
+link path=usr/lib/libgutenprint.so target=libgutenprint.so.2.0.8
+link path=usr/lib/libgutenprint.so.2 target=libgutenprint.so.2.0.8
file path=usr/lib/libgutenprint.so.2.0.8
+link path=usr/lib/libgutenprintui2.so target=libgutenprintui2.so.1.0.0
+link path=usr/lib/libgutenprintui2.so.1 target=libgutenprintui2.so.1.0.0
file path=usr/lib/libgutenprintui2.so.1.0.0
+dir path=usr/lib/pkgconfig
file path=usr/lib/pkgconfig/gutenprint.pc
file path=usr/lib/pkgconfig/gutenprintui2.pc
+dir path=usr/sbin
file path=usr/sbin/cups-genppd.5.2
file path=usr/sbin/cups-genppdupdate
+dir path=usr/share
+dir path=usr/share/cups
file path=usr/share/cups/calibrate.ppm
+dir path=usr/share/gutenprint
+dir path=usr/share/gutenprint/5.2
+dir path=usr/share/gutenprint/5.2/xml
file path=usr/share/gutenprint/5.2/xml/dither-matrix-1x1.xml
file path=usr/share/gutenprint/5.2/xml/dither-matrix-2x1.xml
file path=usr/share/gutenprint/5.2/xml/dither-matrix-4x1.xml
+dir path=usr/share/gutenprint/5.2/xml/escp2
+dir path=usr/share/gutenprint/5.2/xml/escp2/inks
file path=usr/share/gutenprint/5.2/xml/escp2/inks/artisan.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inks/b500.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inks/c120.xml
@@ -210,11 +159,11 @@
file path=usr/share/gutenprint/5.2/xml/escp2/inks/wf40.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inks/wf500.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inks/x80.xml
+dir path=usr/share/gutenprint/5.2/xml/escp2/inputslots
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/artisan.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/b500.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd.xml
-file \
- path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
+file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_cutter_roll_feed.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cd_roll_feed.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/cutter_roll_feed.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/default.xml
@@ -228,6 +177,7 @@
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/rx700.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/spro5000.xml
file path=usr/share/gutenprint/5.2/xml/escp2/inputslots/standard_roll_feed.xml
+dir path=usr/share/gutenprint/5.2/xml/escp2/media
file path=usr/share/gutenprint/5.2/xml/escp2/media/artisan.xml
file path=usr/share/gutenprint/5.2/xml/escp2/media/b500.xml
file path=usr/share/gutenprint/5.2/xml/escp2/media/c120.xml
@@ -269,7 +219,9 @@
file path=usr/share/gutenprint/5.2/xml/escp2/media/ultrachrome.xml
file path=usr/share/gutenprint/5.2/xml/escp2/media/wf500.xml
file path=usr/share/gutenprint/5.2/xml/escp2/media/x80.xml
+dir path=usr/share/gutenprint/5.2/xml/escp2/mediasizes
file path=usr/share/gutenprint/5.2/xml/escp2/mediasizes/standard.xml
+dir path=usr/share/gutenprint/5.2/xml/escp2/model
file path=usr/share/gutenprint/5.2/xml/escp2/model/model_0.xml
file path=usr/share/gutenprint/5.2/xml/escp2/model/model_1.xml
file path=usr/share/gutenprint/5.2/xml/escp2/model/model_10.xml
@@ -386,17 +338,20 @@
file path=usr/share/gutenprint/5.2/xml/escp2/model/model_97.xml
file path=usr/share/gutenprint/5.2/xml/escp2/model/model_98.xml
file path=usr/share/gutenprint/5.2/xml/escp2/model/model_99.xml
+dir path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets
file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/p1_5.xml
file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/picturemate.xml
file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/standard.xml
file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/v2880.xml
file path=usr/share/gutenprint/5.2/xml/escp2/qualitypresets/wf40.xml
+dir path=usr/share/gutenprint/5.2/xml/escp2/weaves
file path=usr/share/gutenprint/5.2/xml/escp2/weaves/pro7000.xml
file path=usr/share/gutenprint/5.2/xml/escp2/weaves/pro7500.xml
file path=usr/share/gutenprint/5.2/xml/escp2/weaves/pro7600.xml
file path=usr/share/gutenprint/5.2/xml/escp2/weaves/standard.xml
file path=usr/share/gutenprint/5.2/xml/papers.xml
file path=usr/share/gutenprint/5.2/xml/printers.xml
+dir path=usr/share/gutenprint/doc
file path=usr/share/gutenprint/doc/AUTHORS
file path=usr/share/gutenprint/doc/COPYING
file path=usr/share/gutenprint/doc/ChangeLog
@@ -406,6 +361,7 @@
file path=usr/share/gutenprint/doc/gutenprint-users-manual.odt
file path=usr/share/gutenprint/doc/gutenprint-users-manual.pdf
file path=usr/share/gutenprint/doc/gutenprint.pdf
+dir path=usr/share/gutenprint/doc/reference-html
file path=usr/share/gutenprint/doc/reference-html/book1.html
file path=usr/share/gutenprint/doc/reference-html/c1717.html
file path=usr/share/gutenprint/doc/reference-html/c194.html
@@ -425,33 +381,78 @@
file path=usr/share/gutenprint/doc/reference-html/x67.html
file path=usr/share/gutenprint/doc/reference-html/x79.html
file path=usr/share/gutenprint/doc/reference-html/x955.html
+dir path=usr/share/gutenprint/samples
file path=usr/share/gutenprint/samples/colorbars4.png
file path=usr/share/gutenprint/samples/colorsweep.png
file path=usr/share/gutenprint/samples/extended.sample
file path=usr/share/gutenprint/samples/profile.jpg
file path=usr/share/gutenprint/samples/testpattern.sample
+dir path=usr/share/locale
+dir path=usr/share/locale/cs
+dir path=usr/share/locale/cs/LC_MESSAGES
file path=usr/share/locale/cs/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/da
+dir path=usr/share/locale/da/LC_MESSAGES
file path=usr/share/locale/da/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/de
+dir path=usr/share/locale/de/LC_MESSAGES
file path=usr/share/locale/de/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/el
+dir path=usr/share/locale/el/LC_MESSAGES
file path=usr/share/locale/el/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/en_GB
+dir path=usr/share/locale/en_GB/LC_MESSAGES
file path=usr/share/locale/en_GB/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/es
+dir path=usr/share/locale/es/LC_MESSAGES
file path=usr/share/locale/es/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/fi
+dir path=usr/share/locale/fi/LC_MESSAGES
file path=usr/share/locale/fi/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/fr
+dir path=usr/share/locale/fr/LC_MESSAGES
file path=usr/share/locale/fr/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/hu
+dir path=usr/share/locale/hu/LC_MESSAGES
file path=usr/share/locale/hu/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/it
+dir path=usr/share/locale/it/LC_MESSAGES
file path=usr/share/locale/it/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/ja
+dir path=usr/share/locale/ja/LC_MESSAGES
file path=usr/share/locale/ja/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/nb
+dir path=usr/share/locale/nb/LC_MESSAGES
file path=usr/share/locale/nb/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/nl
+dir path=usr/share/locale/nl/LC_MESSAGES
file path=usr/share/locale/nl/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/pl
+dir path=usr/share/locale/pl/LC_MESSAGES
file path=usr/share/locale/pl/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/pt
+dir path=usr/share/locale/pt/LC_MESSAGES
file path=usr/share/locale/pt/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/ru
+dir path=usr/share/locale/ru/LC_MESSAGES
file path=usr/share/locale/ru/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/sk
+dir path=usr/share/locale/sk/LC_MESSAGES
file path=usr/share/locale/sk/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/sl
+dir path=usr/share/locale/sl/LC_MESSAGES
file path=usr/share/locale/sl/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/sv
+dir path=usr/share/locale/sv/LC_MESSAGES
file path=usr/share/locale/sv/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/locale/zh_TW
+dir path=usr/share/locale/zh_TW/LC_MESSAGES
file path=usr/share/locale/zh_TW/LC_MESSAGES/gutenprint.mo
+dir path=usr/share/man
+dir path=usr/share/man/man1
file path=usr/share/man/man1/escputil.1
file path=usr/share/man/man1/ijsgutenprint.1
+dir path=usr/share/man/man8
file path=usr/share/man/man8/cups-calibrate.8
file path=usr/share/man/man8/cups-genppd.8
file path=usr/share/man/man8/cups-genppdupdate.8
@@ -459,7 +460,3 @@
desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers" \
name="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
license gutenprint.license license="GPLv2, FDLv1.2"
-link path=usr/lib/libgutenprint.so target=libgutenprint.so.2.0.8
-link path=usr/lib/libgutenprint.so.2 target=libgutenprint.so.2.0.8
-link path=usr/lib/libgutenprintui2.so target=libgutenprintui2.so.1.0.0
-link path=usr/lib/libgutenprintui2.so.1 target=libgutenprintui2.so.1.0.0