--- a/components/cups/cups.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/cups/cups.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,7 +18,7 @@
#
# 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.
#
# This is the template for package manifest (.p5m) file
@@ -33,203 +33,79 @@
<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/cups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/print/cups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Common Unix Print System (CUPS)"
set name=com.oracle.info.description value="the Common Unix Print System (CUPS)"
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=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2008/130
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license cups-license license="CUPS, GPLv2, LGPLv2.1, Aladdin, Unicode"
-
-# When USB/non-postscript printer is detected in desktop no test-page can be printed
-# when ghostscrip is not installed.
-depend fmri=print/filter/ghostscript type=require
-
-dir path=etc
-
-#
-dir group=lp path=etc/cups
-dir group=lp path=etc/cups/interfaces
-dir group=lp path=etc/cups/ppd
-dir group=lp path=etc/cups/ssl mode=0700
-
-dir path=etc/dbus-1
-dir path=etc/dbus-1/system.d
-
-dir path=etc/security/auth_attr.d
-dir path=etc/security/prof_attr.d
-
-dir path=lib
-dir path=lib/svc
-dir path=lib/svc/manifest
+dir path=etc
#
-dir group=sys path=lib/svc/manifest/application
+dir path=etc/cups group=lp
-dir path=lib/svc/method
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/cups
-dir path=usr/lib
-dir path=usr/lib/cups
-dir path=usr/lib/cups/backend
-dir path=usr/lib/cups/cgi-bin
-dir path=usr/lib/cups/daemon
-dir path=usr/lib/cups/driver
-dir path=usr/lib/cups/filter
-dir path=usr/lib/cups/monitor
-dir path=usr/lib/cups/notifier
-dir path=usr/lib/cups/startup
-
-# SMF help dir
-dir path=usr/lib/help/auths/locale/C
+# edited file-objects
+file path=etc/cups/cupsd.conf group=lp mode=0640 preserve=true
-dir path=usr/lib/pkgconfig
-dir path=usr/sbin
-dir path=usr/share
-dir path=usr/share/applications
-dir path=usr/share/cups
-dir path=usr/share/cups/banners
-dir path=usr/share/cups/charmaps
-dir path=usr/share/cups/charsets
-dir path=usr/share/cups/data
-dir path=usr/share/cups/drv
-dir path=usr/share/cups/examples
-dir path=usr/share/cups/fonts
-dir path=usr/share/cups/mime
-dir path=usr/share/cups/model
-dir path=usr/share/cups/ppdc
-dir path=usr/share/cups/profiles
-dir path=usr/share/cups/templates
-dir path=usr/share/cups/templates/de
-dir path=usr/share/cups/templates/es
-dir path=usr/share/cups/templates/eu
-dir path=usr/share/cups/templates/id
-dir path=usr/share/cups/templates/it
-dir path=usr/share/cups/templates/ja
-dir path=usr/share/cups/templates/pl
-dir path=usr/share/cups/templates/ru
-dir path=usr/share/doc
-dir path=usr/share/doc/cups
-dir path=usr/share/doc/cups/de
-dir path=usr/share/doc/cups/es
-dir path=usr/share/doc/cups/eu
-dir path=usr/share/doc/cups/help
-dir path=usr/share/doc/cups/id
-dir path=usr/share/doc/cups/images
-dir path=usr/share/doc/cups/it
-dir path=usr/share/doc/cups/ja
-dir path=usr/share/doc/cups/pl
-dir path=usr/share/doc/cups/ru
-dir path=usr/share/icons
-dir path=usr/share/icons/hicolor
-dir path=usr/share/icons/hicolor/128x128
-dir path=usr/share/icons/hicolor/128x128/apps
-dir path=usr/share/icons/hicolor/16x16
-dir path=usr/share/icons/hicolor/16x16/apps
-dir path=usr/share/icons/hicolor/32x32
-dir path=usr/share/icons/hicolor/32x32/apps
-dir path=usr/share/icons/hicolor/64x64
-dir path=usr/share/icons/hicolor/64x64/apps
-dir path=usr/share/locale
-dir path=usr/share/locale/da
-dir path=usr/share/locale/de
-dir path=usr/share/locale/es
-dir path=usr/share/locale/eu
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/id
-dir path=usr/share/locale/it
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ko
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/no
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pt
-dir path=usr/share/locale/pt_BR
-dir path=usr/share/locale/ru
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/zh_CN
-dir path=usr/share/locale/zh_TW
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man5
-dir path=usr/share/man/man7
-dir path=usr/share/man/man8
-dir path=var
-dir path=var/cache
+# file-objects from sample-manifest
+file path=etc/cups/cupsd.conf.default
+dir path=etc/cups/interfaces group=lp
+dir path=etc/cups/ppd group=lp
+file path=etc/cups/snmp.conf
+dir path=etc/cups/ssl group=lp mode=0700
+dir path=etc/dbus-1
+dir path=etc/dbus-1/system.d
+file path=etc/dbus-1/system.d/cups.conf
+dir path=etc/security/auth_attr.d
+
+# install the service to set up CUPS as the default print service
+file Solaris/auth_attr path=etc/security/auth_attr.d/cups
+dir path=etc/security/prof_attr.d
+file Solaris/prof_attr path=etc/security/prof_attr.d/cups
+dir path=lib
+dir path=lib/svc
+dir path=lib/svc/manifest
#
-dir group=lp path=var/cache/cups mode=0775
-dir group=lp path=var/cache/cups/rss mode=0775
-dir group=sys path=var/log
-dir group=lp path=var/log/cups
-
-dir path=var/spool
-
-#
-dir group=lp path=var/spool/cups mode=0710
-dir group=lp path=var/spool/cups/tmp mode=01770
-
-# edited file-objects
-file group=lp mode=0640 path=etc/cups/cupsd.conf preserve=true
+dir path=lib/svc/manifest/application group=sys
file path=lib/svc/manifest/application/cups.xml mode=0444 \
- restart_fmri=svc:/system/manifest-import:default
+ restart_fmri=svc:/system/manifest-import:default
+dir path=lib/svc/method
# SMF service start method script
file Solaris/svc-cupsd path=lib/svc/method/svc-cupsd
-
-# SMF help
-file Solaris/ManageCUPS.html mode=0444 \
- path=usr/lib/help/auths/locale/C/ManageCUPS.html
-
+dir path=usr
+dir path=usr/bin
file path=usr/bin/cancel
-file path=usr/bin/lp
-file path=usr/bin/lpr
-file path=usr/bin/lpstat
-file path=usr/bin/lpq
-file path=usr/bin/lprm
-file path=usr/sbin/cupsaccept
-file path=usr/sbin/lpc
-file path=usr/sbin/lpmove
-file path=usr/sbin/lpadmin
-file path=usr/sbin/lpinfo
-
-# install the desktop menu related bits
-file Solaris/desktop-print-management mode=0555 \
- path=usr/bin/desktop-print-management
-file Solaris/desktop-print-management-applet mode=0555 \
- path=usr/bin/desktop-print-management-applet
-file Solaris/smb mode=0555 \
- path=usr/lib/cups/backend/smb
-
-# install the service to set up CUPS as the default print service
-file Solaris/auth_attr path=etc/security/auth_attr.d/cups
-file Solaris/prof_attr path=etc/security/prof_attr.d/cups
-
-# fix to not conflict with JDS
-file usr/share/locale/zh/cups_zh.po path=usr/share/locale/zh_CN/cups_zh.po
-
-# file-objects from sample-manifest
-file path=etc/cups/cupsd.conf.default
-file path=etc/cups/snmp.conf
-file path=etc/dbus-1/system.d/cups.conf
file path=usr/bin/cups-config
file path=usr/bin/cupstestdsc
file path=usr/bin/cupstestppd
+
+# install the desktop menu related bits
+file Solaris/desktop-print-management path=usr/bin/desktop-print-management \
+ mode=0555
+file Solaris/desktop-print-management-applet \
+ path=usr/bin/desktop-print-management-applet mode=0555
+link path=usr/bin/disable target=../sbin/cupsaccept
+link path=usr/bin/enable target=../sbin/cupsaccept
+file path=usr/bin/lp
file path=usr/bin/lpoptions
file path=usr/bin/lppasswd
+file path=usr/bin/lpq
+file path=usr/bin/lpr
+file path=usr/bin/lprm
+file path=usr/bin/lpstat
file path=usr/bin/ppdc
file path=usr/bin/ppdhtml
file path=usr/bin/ppdi
file path=usr/bin/ppdmerge
file path=usr/bin/ppdpo
+dir path=usr/include
+dir path=usr/include/cups
file path=usr/include/cups/adminutil.h
file path=usr/include/cups/array.h
file path=usr/include/cups/backend.h
@@ -250,23 +126,32 @@
file path=usr/include/cups/sidechannel.h
file path=usr/include/cups/transcode.h
file path=usr/include/cups/versioning.h
+dir path=usr/lib
+dir path=usr/lib/cups
+dir path=usr/lib/cups/backend
+link path=usr/lib/cups/backend/http target=ipp
file path=usr/lib/cups/backend/ipp mode=0500
file path=usr/lib/cups/backend/lpd mode=0500
file path=usr/lib/cups/backend/parallel
file path=usr/lib/cups/backend/scsi
file path=usr/lib/cups/backend/serial
+file Solaris/smb path=usr/lib/cups/backend/smb mode=0555
file path=usr/lib/cups/backend/snmp
file path=usr/lib/cups/backend/socket
file path=usr/lib/cups/backend/usb
+dir path=usr/lib/cups/cgi-bin
file path=usr/lib/cups/cgi-bin/admin.cgi
file path=usr/lib/cups/cgi-bin/classes.cgi
file path=usr/lib/cups/cgi-bin/help.cgi
file path=usr/lib/cups/cgi-bin/jobs.cgi
file path=usr/lib/cups/cgi-bin/printers.cgi
+dir path=usr/lib/cups/daemon
file path=usr/lib/cups/daemon/cups-deviced
file path=usr/lib/cups/daemon/cups-driverd
file path=usr/lib/cups/daemon/cups-lpd
file path=usr/lib/cups/daemon/cups-polld
+dir path=usr/lib/cups/driver
+dir path=usr/lib/cups/filter
file path=usr/lib/cups/filter/bannertops
file path=usr/lib/cups/filter/commandtoescpx
file path=usr/lib/cups/filter/commandtopclx
@@ -277,6 +162,7 @@
file path=usr/lib/cups/filter/imagetoraster
file path=usr/lib/cups/filter/pdftops
file path=usr/lib/cups/filter/pstops
+link path=usr/lib/cups/filter/rastertodymo target=rastertolabel
file path=usr/lib/cups/filter/rastertoepson
file path=usr/lib/cups/filter/rastertoescpx
file path=usr/lib/cups/filter/rastertohp
@@ -286,20 +172,50 @@
file Solaris/tsol_banner.ps path=usr/lib/cups/filter/tsol_banner.ps
file Solaris/tsol_separator.ps path=usr/lib/cups/filter/tsol_separator.ps
file Solaris/tsol_trailer.ps path=usr/lib/cups/filter/tsol_trailer.ps
+dir path=usr/lib/cups/monitor
file path=usr/lib/cups/monitor/bcp
file path=usr/lib/cups/monitor/tbcp
+dir path=usr/lib/cups/notifier
file path=usr/lib/cups/notifier/dbus
file path=usr/lib/cups/notifier/mailto
file path=usr/lib/cups/notifier/rss
+dir path=usr/lib/cups/startup
+
+# SMF help dir
+dir path=usr/lib/help/auths/locale/C
+
+# SMF help
+file Solaris/ManageCUPS.html path=usr/lib/help/auths/locale/C/ManageCUPS.html \
+ mode=0444
+link path=usr/lib/libcupscgi.so target=libcupscgi.so.1
file path=usr/lib/libcupscgi.so.1
+link path=usr/lib/libcupsdriver.so target=libcupsdriver.so.1
file path=usr/lib/libcupsdriver.so.1
+link path=usr/lib/libcupsmime.so target=libcupsmime.so.1
file path=usr/lib/libcupsmime.so.1
+link path=usr/lib/libcupsppdc.so target=libcupsppdc.so.1
file path=usr/lib/libcupsppdc.so.1
+dir path=usr/lib/pkgconfig
file path=usr/lib/pkgconfig/cups.pc
+dir path=usr/sbin
+link path=usr/sbin/accept target=cupsaccept
+file path=usr/sbin/cupsaccept
file path=usr/sbin/cupsaddsmb
file path=usr/sbin/cupsctl
file path=usr/sbin/cupsd
+link path=usr/sbin/cupsdisable target=cupsaccept
+link path=usr/sbin/cupsenable target=cupsaccept
file path=usr/sbin/cupsfilter
+link path=usr/sbin/cupsreject target=cupsaccept
+file path=usr/sbin/lpadmin
+file path=usr/sbin/lpc
+file path=usr/sbin/lpinfo
+file path=usr/sbin/lpmove
+link path=usr/sbin/reject target=cupsaccept
+dir path=usr/share
+dir path=usr/share/applications
+dir path=usr/share/cups
+dir path=usr/share/cups/banners
file path=usr/share/cups/banners/classified
file path=usr/share/cups/banners/confidential
file path=usr/share/cups/banners/labeled
@@ -307,6 +223,7 @@
file path=usr/share/cups/banners/standard
file path=usr/share/cups/banners/topsecret
file path=usr/share/cups/banners/unclassified
+dir path=usr/share/cups/charmaps
file path=usr/share/cups/charmaps/euc-cn.txt
file path=usr/share/cups/charmaps/euc-jp.txt
file path=usr/share/cups/charmaps/euc-kr.txt
@@ -345,11 +262,15 @@
file path=usr/share/cups/charmaps/windows-936.txt
file path=usr/share/cups/charmaps/windows-949.txt
file path=usr/share/cups/charmaps/windows-950.txt
+dir path=usr/share/cups/charsets
file path=usr/share/cups/charsets/utf-8
+dir path=usr/share/cups/data
file path=usr/share/cups/data/HPGLprolog
file path=usr/share/cups/data/psglyphs
file path=usr/share/cups/data/testprint
+dir path=usr/share/cups/drv
file path=usr/share/cups/drv/sample.drv
+dir path=usr/share/cups/examples
file path=usr/share/cups/examples/color.drv
file path=usr/share/cups/examples/constraint.drv
file path=usr/share/cups/examples/custom.drv
@@ -361,12 +282,16 @@
file path=usr/share/cups/examples/r300-basic.drv
file path=usr/share/cups/examples/r300-colorman.drv
file path=usr/share/cups/examples/r300-remote.drv
+dir path=usr/share/cups/fonts
file path=usr/share/cups/fonts/Monospace
file path=usr/share/cups/fonts/Monospace-Bold
file path=usr/share/cups/fonts/Monospace-BoldOblique
file path=usr/share/cups/fonts/Monospace-Oblique
+dir path=usr/share/cups/mime
file path=usr/share/cups/mime/mime.convs
file path=usr/share/cups/mime/mime.types
+dir path=usr/share/cups/model
+dir path=usr/share/cups/ppdc
file path=usr/share/cups/ppdc/epson.h
file path=usr/share/cups/ppdc/escp.h
file path=usr/share/cups/ppdc/font.defs
@@ -375,6 +300,8 @@
file path=usr/share/cups/ppdc/media.defs
file path=usr/share/cups/ppdc/pcl.h
file path=usr/share/cups/ppdc/raster.defs
+dir path=usr/share/cups/profiles
+dir path=usr/share/cups/templates
file path=usr/share/cups/templates/add-class.tmpl
file path=usr/share/cups/templates/add-printer.tmpl
file path=usr/share/cups/templates/add-rss-subscription.tmpl
@@ -393,6 +320,7 @@
file path=usr/share/cups/templates/classes-header.tmpl
file path=usr/share/cups/templates/classes.tmpl
file path=usr/share/cups/templates/command.tmpl
+dir path=usr/share/cups/templates/de
file path=usr/share/cups/templates/de/add-class.tmpl
file path=usr/share/cups/templates/de/add-printer.tmpl
file path=usr/share/cups/templates/de/add-rss-subscription.tmpl
@@ -466,6 +394,7 @@
file path=usr/share/cups/templates/edit-config.tmpl
file path=usr/share/cups/templates/error-op.tmpl
file path=usr/share/cups/templates/error.tmpl
+dir path=usr/share/cups/templates/es
file path=usr/share/cups/templates/es/add-class.tmpl
file path=usr/share/cups/templates/es/add-printer.tmpl
file path=usr/share/cups/templates/es/add-rss-subscription.tmpl
@@ -536,6 +465,7 @@
file path=usr/share/cups/templates/es/test-page.tmpl
file path=usr/share/cups/templates/es/trailer.tmpl
file path=usr/share/cups/templates/es/users.tmpl
+dir path=usr/share/cups/templates/eu
file path=usr/share/cups/templates/eu/add-class.tmpl
file path=usr/share/cups/templates/eu/add-printer.tmpl
file path=usr/share/cups/templates/eu/add-rss-subscription.tmpl
@@ -610,6 +540,7 @@
file path=usr/share/cups/templates/help-header.tmpl
file path=usr/share/cups/templates/help-printable.tmpl
file path=usr/share/cups/templates/help-trailer.tmpl
+dir path=usr/share/cups/templates/id
file path=usr/share/cups/templates/id/add-class.tmpl
file path=usr/share/cups/templates/id/add-printer.tmpl
file path=usr/share/cups/templates/id/add-rss-subscription.tmpl
@@ -680,6 +611,7 @@
file path=usr/share/cups/templates/id/test-page.tmpl
file path=usr/share/cups/templates/id/trailer.tmpl
file path=usr/share/cups/templates/id/users.tmpl
+dir path=usr/share/cups/templates/it
file path=usr/share/cups/templates/it/add-class.tmpl
file path=usr/share/cups/templates/it/add-printer.tmpl
file path=usr/share/cups/templates/it/add-rss-subscription.tmpl
@@ -749,6 +681,7 @@
file path=usr/share/cups/templates/it/test-page.tmpl
file path=usr/share/cups/templates/it/trailer.tmpl
file path=usr/share/cups/templates/it/users.tmpl
+dir path=usr/share/cups/templates/ja
file path=usr/share/cups/templates/ja/add-class.tmpl
file path=usr/share/cups/templates/ja/add-printer.tmpl
file path=usr/share/cups/templates/ja/add-rss-subscription.tmpl
@@ -838,6 +771,7 @@
file path=usr/share/cups/templates/option-pickone.tmpl
file path=usr/share/cups/templates/option-trailer.tmpl
file path=usr/share/cups/templates/pager.tmpl
+dir path=usr/share/cups/templates/pl
file path=usr/share/cups/templates/pl/add-class.tmpl
file path=usr/share/cups/templates/pl/add-printer.tmpl
file path=usr/share/cups/templates/pl/add-rss-subscription.tmpl
@@ -924,6 +858,7 @@
file path=usr/share/cups/templates/printers-header.tmpl
file path=usr/share/cups/templates/printers.tmpl
file path=usr/share/cups/templates/restart.tmpl
+dir path=usr/share/cups/templates/ru
file path=usr/share/cups/templates/ru/add-class.tmpl
file path=usr/share/cups/templates/ru/add-printer.tmpl
file path=usr/share/cups/templates/ru/add-rss-subscription.tmpl
@@ -1004,11 +939,17 @@
file path=usr/share/cups/templates/test-page.tmpl
file path=usr/share/cups/templates/trailer.tmpl
file path=usr/share/cups/templates/users.tmpl
+dir path=usr/share/doc
+dir path=usr/share/doc/cups
file path=usr/share/doc/cups/cups-printable.css
file path=usr/share/doc/cups/cups.css
+dir path=usr/share/doc/cups/de
file path=usr/share/doc/cups/de/index.html
+dir path=usr/share/doc/cups/es
file path=usr/share/doc/cups/es/index.html
+dir path=usr/share/doc/cups/eu
file path=usr/share/doc/cups/eu/index.html
+dir path=usr/share/doc/cups/help
file path=usr/share/doc/cups/help/accounting.html
file path=usr/share/doc/cups/help/api-array.html
file path=usr/share/doc/cups/help/api-cgi.html
@@ -1091,7 +1032,9 @@
file path=usr/share/doc/cups/help/standard.html
file path=usr/share/doc/cups/help/translation.html
file path=usr/share/doc/cups/help/whatsnew.html
+dir path=usr/share/doc/cups/id
file path=usr/share/doc/cups/id/index.html
+dir path=usr/share/doc/cups/images
file path=usr/share/doc/cups/images/color-wheel.png
file path=usr/share/doc/cups/images/cups-block-diagram.png
file path=usr/share/doc/cups/images/cups-command-chain.png
@@ -1108,35 +1051,80 @@
file path=usr/share/doc/cups/images/unsel.gif
file path=usr/share/doc/cups/images/wait.gif
file path=usr/share/doc/cups/index.html
+dir path=usr/share/doc/cups/it
file path=usr/share/doc/cups/it/index.html
+dir path=usr/share/doc/cups/ja
file path=usr/share/doc/cups/ja/index.html
+dir path=usr/share/doc/cups/pl
file path=usr/share/doc/cups/pl/index.html
file path=usr/share/doc/cups/robots.txt
+dir path=usr/share/doc/cups/ru
file path=usr/share/doc/cups/ru/index.html
+dir path=usr/share/icons
+dir path=usr/share/icons/hicolor
+dir path=usr/share/icons/hicolor/128x128
+dir path=usr/share/icons/hicolor/128x128/apps
file path=usr/share/icons/hicolor/128x128/apps/cups.png
+dir path=usr/share/icons/hicolor/16x16
+dir path=usr/share/icons/hicolor/16x16/apps
file path=usr/share/icons/hicolor/16x16/apps/cups.png
+dir path=usr/share/icons/hicolor/32x32
+dir path=usr/share/icons/hicolor/32x32/apps
file path=usr/share/icons/hicolor/32x32/apps/cups.png
+dir path=usr/share/icons/hicolor/64x64
+dir path=usr/share/icons/hicolor/64x64/apps
file path=usr/share/icons/hicolor/64x64/apps/cups.png
+dir path=usr/share/locale
+dir path=usr/share/locale/da
file path=usr/share/locale/da/cups_da.po
+dir path=usr/share/locale/de
file path=usr/share/locale/de/cups_de.po
+dir path=usr/share/locale/es
file path=usr/share/locale/es/cups_es.po
+dir path=usr/share/locale/eu
file path=usr/share/locale/eu/cups_eu.po
+dir path=usr/share/locale/fi
file path=usr/share/locale/fi/cups_fi.po
+dir path=usr/share/locale/fr
file path=usr/share/locale/fr/cups_fr.po
+dir path=usr/share/locale/id
file path=usr/share/locale/id/cups_id.po
+dir path=usr/share/locale/it
file path=usr/share/locale/it/cups_it.po
+dir path=usr/share/locale/ja
file path=usr/share/locale/ja/cups_ja.po
+dir path=usr/share/locale/ko
file path=usr/share/locale/ko/cups_ko.po
+dir path=usr/share/locale/nl
file path=usr/share/locale/nl/cups_nl.po
+dir path=usr/share/locale/no
file path=usr/share/locale/no/cups_no.po
+dir path=usr/share/locale/pl
file path=usr/share/locale/pl/cups_pl.po
+dir path=usr/share/locale/pt
file path=usr/share/locale/pt/cups_pt.po
+dir path=usr/share/locale/pt_BR
file path=usr/share/locale/pt_BR/cups_pt_BR.po
+dir path=usr/share/locale/ru
file path=usr/share/locale/ru/cups_ru.po
+dir path=usr/share/locale/sv
file path=usr/share/locale/sv/cups_sv.po
+
+# fix to not conflict with JDS
+link path=usr/share/locale/zh target=zh_CN
+dir path=usr/share/locale/zh_CN
+
+# fix to not conflict with JDS
+file usr/share/locale/zh/cups_zh.po path=usr/share/locale/zh_CN/cups_zh.po
+dir path=usr/share/locale/zh_TW
file path=usr/share/locale/zh_TW/cups_zh_TW.po
+dir path=usr/share/man
+dir path=usr/share/man/man1
+link path=usr/share/man/man1/accept.1 target=../man1m/cupsaccept.1m
file path=usr/share/man/man1/cancel.1
file path=usr/share/man/man1/cups-config.1
+link path=usr/share/man/man1/cupsdisable.1 target=../man1m/cupsenable.1m
+link path=usr/share/man/man1/cupsreject.1 target=../man1m/cupsaccept.1m
file path=usr/share/man/man1/cupstestdsc.1
file path=usr/share/man/man1/cupstestppd.1
file path=usr/share/man/man1/lp.1
@@ -1151,10 +1139,11 @@
file path=usr/share/man/man1/ppdi.1
file path=usr/share/man/man1/ppdmerge.1
file path=usr/share/man/man1/ppdpo.1
+link path=usr/share/man/man1/reject.1 target=../man1m/cupsaccept.1m
file path=usr/share/man/man1m/cups-deviced.1m
file path=usr/share/man/man1m/cups-driverd.1m
file path=usr/share/man/man1m/cups-lpd.1m
-file path=usr/share/man/man1m/cups-polld.1m
+file path=usr/share/man/man1m/cups-polld.1m
file path=usr/share/man/man1m/cupsaccept.1m
file path=usr/share/man/man1m/cupsaddsmb.1m
file path=usr/share/man/man1m/cupsctl.1m
@@ -1165,6 +1154,22 @@
file path=usr/share/man/man1m/lpc.1m
file path=usr/share/man/man1m/lpinfo.1m
file path=usr/share/man/man1m/lpmove.1m
+dir path=usr/share/man/man5
+file path=usr/share/man/man5/classes.conf.5
+file path=usr/share/man/man5/client.conf.5
+file path=usr/share/man/man5/cups-snmp.conf.5
+file path=usr/share/man/man5/cupsd.conf.5
+file path=usr/share/man/man5/mailto.conf.5
+file path=usr/share/man/man5/mime.convs.5
+file path=usr/share/man/man5/mime.types.5
+file path=usr/share/man/man5/ppdcfile.5
+file path=usr/share/man/man5/printers.conf.5
+file path=usr/share/man/man5/subscriptions.conf.5
+dir path=usr/share/man/man7
+file path=usr/share/man/man7/backend.7
+file path=usr/share/man/man7/filter.7
+file path=usr/share/man/man7/notifier.7
+dir path=usr/share/man/man8
# Pages for cups from "1m" sections should also be copied to "8" section.
file usr/share/man/man1m/cups-deviced.1m path=usr/share/man/man8/cups-deviced.8
file usr/share/man/man1m/cups-driverd.1m path=usr/share/man/man8/cups-driverd.8
@@ -1180,39 +1185,21 @@
file usr/share/man/man1m/lpc.1m path=usr/share/man/man8/lpc.8
file usr/share/man/man1m/lpinfo.1m path=usr/share/man/man8/lpinfo.8
file usr/share/man/man1m/lpmove.1m path=usr/share/man/man8/lpmove.8
-file path=usr/share/man/man5/classes.conf.5
-file path=usr/share/man/man5/client.conf.5
-file path=usr/share/man/man5/cups-snmp.conf.5
-file path=usr/share/man/man5/cupsd.conf.5
-file path=usr/share/man/man5/mailto.conf.5
-file path=usr/share/man/man5/mime.convs.5
-file path=usr/share/man/man5/mime.types.5
-file path=usr/share/man/man5/ppdcfile.5
-file path=usr/share/man/man5/printers.conf.5
-file path=usr/share/man/man5/subscriptions.conf.5
-file path=usr/share/man/man7/backend.7
-file path=usr/share/man/man7/filter.7
-file path=usr/share/man/man7/notifier.7
-
-# fix to not conflict with JDS
-link path=usr/share/locale/zh target=zh_CN
+dir path=var
+dir path=var/cache
-link path=usr/lib/cups/backend/http target=ipp
-link path=usr/lib/cups/filter/rastertodymo target=rastertolabel
-link path=usr/lib/libcupscgi.so target=libcupscgi.so.1
-link path=usr/lib/libcupsdriver.so target=libcupsdriver.so.1
-link path=usr/lib/libcupsmime.so target=libcupsmime.so.1
-link path=usr/lib/libcupsppdc.so target=libcupsppdc.so.1
+#
+dir path=var/cache/cups group=lp mode=0775
+dir path=var/cache/cups/rss group=lp mode=0775
+dir path=var/log group=sys
+dir path=var/log/cups group=lp
+dir path=var/spool
-link path=usr/sbin/accept target=cupsaccept
-link path=usr/sbin/cupsdisable target=cupsaccept
-link path=usr/bin/disable target=../sbin/cupsaccept
-link path=usr/sbin/cupsenable target=cupsaccept
-link path=usr/bin/enable target=../sbin/cupsaccept
-link path=usr/sbin/cupsreject target=cupsaccept
-link path=usr/sbin/reject target=cupsaccept
+#
+dir path=var/spool/cups group=lp mode=0710
+dir path=var/spool/cups/tmp group=lp mode=01770
+license cups-license license="CUPS, GPLv2, LGPLv2.1, Aladdin, Unicode"
-link path=usr/share/man/man1/accept.1 target=../man1m/cupsaccept.1m
-link path=usr/share/man/man1/cupsdisable.1 target=../man1m/cupsenable.1m
-link path=usr/share/man/man1/cupsreject.1 target=../man1m/cupsaccept.1m
-link path=usr/share/man/man1/reject.1 target=../man1m/cupsaccept.1m
+# When USB/non-postscript printer is detected in desktop no test-page can be printed
+# when ghostscrip is not installed.
+depend type=require fmri=print/filter/ghostscript