- Update to 1.2.0

PR:		ports/97783
		ports/97782
Submitted by:	maintainer

1 files changed, 730 insertions, 457 deletions

diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index d73ffab2b078..5812b0e5e87a 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -1,13 +1,10 @@
 @exec /bin/echo "===>" Stopping cupsd ...
 @exec /usr/bin/killall cupsd || true
-@exec /bin/rmdir %D/etc/cups/certs/* > /dev/null 2>&1 || true
-bin/cups-config
-@unexec if cmp -s %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; then rm -f %D/etc/cups/classes.conf; fi
-etc/cups/classes.conf.N
-@exec if test ! -f %D/etc/cups/classes.conf; then cp -p %D/etc/cups/classes.conf.N %D/etc/cups/classes.conf; fi
-@unexec if cmp -s %D/etc/cups/client.conf.N %D/etc/cups/client.conf; then rm -f %D/etc/cups/client.conf; fi
-etc/cups/client.conf.N
-@exec if test ! -f %D/etc/cups/client.conf; then cp -p %D/etc/cups/client.conf.N %D/etc/cups/client.conf; fi
+@exec mkdir -p /var/spool/cups/tmp || true
+@exec chown -R root:daemon /var/spool/cups
+@exec mkdir %D/etc/cups/ppd || true
+@exec mkdir %D/etc/cups/interfaces || true
+@unexec rm -rf /var/spool/cups 2>&1 >/dev/null || true
 @unexec if cmp -s %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; then rm -f %D/etc/cups/cupsd.conf; fi
 etc/cups/cupsd.conf.N
 @exec if test ! -f %D/etc/cups/cupsd.conf; then cp -p %D/etc/cups/cupsd.conf.N %D/etc/cups/cupsd.conf; fi
@@ -17,59 +14,449 @@ etc/cups/mime.convs.N
 @unexec if cmp -s %D/etc/cups/mime.types.N %D/etc/cups/mime.types; then rm -f %D/etc/cups/mime.types; fi
 etc/cups/mime.types.N
 @exec if test ! -f %D/etc/cups/mime.types; then cp -p %D/etc/cups/mime.types.N %D/etc/cups/mime.types; fi
-@unexec if cmp -s %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; then rm -f %D/etc/cups/printers.conf; fi
-etc/cups/printers.conf.N
-@exec if test ! -f %D/etc/cups/printers.conf; then cp -p %D/etc/cups/printers.conf.N %D/etc/cups/printers.conf; fi
+bin/cupstestdsc
+bin/lp
+bin/cancel
+bin/cupstestppd
+bin/lpoptions
+bin/lppasswd
+bin/lpq
+bin/lpr
+bin/lprm
+bin/lpstat
+bin/cups-config
+include/cups/adminutil.h
+include/cups/array.h
 include/cups/cups.h
+include/cups/dir.h
+include/cups/file.h
 include/cups/http.h
-include/cups/image.h
+include/cups/i18n.h
 include/cups/ipp.h
 include/cups/language.h
 include/cups/md5.h
 include/cups/ppd.h
+include/cups/transcode.h
+include/cups/image.h
 include/cups/raster.h
-lib/libcups.a
 lib/libcups.so
 lib/libcups.so.2
-lib/libcupsimage.a
 lib/libcupsimage.so
 lib/libcupsimage.so.2
-libexec/cups/backend/http
-libexec/cups/backend/ipp
-libexec/cups/backend/lpd
-libexec/cups/backend/parallel
-libexec/cups/backend/scsi
-libexec/cups/backend/serial
-libexec/cups/backend/socket
-libexec/cups/backend/usb
-libexec/cups/cgi-bin/admin.cgi
-libexec/cups/cgi-bin/classes.cgi
-libexec/cups/cgi-bin/jobs.cgi
-libexec/cups/cgi-bin/printers.cgi
-libexec/cups/daemon/cups-lpd
-libexec/cups/daemon/cups-polld
-libexec/cups/filter/gziptoany
-libexec/cups/filter/hpgltops
-libexec/cups/filter/imagetops
-libexec/cups/filter/imagetoraster
-libexec/cups/filter/pdftops
-libexec/cups/filter/pstops
-libexec/cups/filter/rastertodymo
-libexec/cups/filter/rastertoepson
-libexec/cups/filter/rastertohp
-libexec/cups/filter/texttops
-sbin/cupsd
+@comment Put man links here
+man/man8/reject.8
+man/man8/cupsdisable.8
+sbin/cupsdisable
+sbin/cupsenable
+sbin/reject
+share/doc/cups/cups.css
+share/doc/cups/cups-printable.css
+share/doc/cups/favicon.ico
+share/doc/cups/index.html
+share/doc/cups/robots.txt
+share/doc/cups/help/api-array.html
+share/doc/cups/help/api-cups.html
+share/doc/cups/help/api-filedir.html
+share/doc/cups/help/api-filter.html
+share/doc/cups/help/api-httpipp.html
+share/doc/cups/help/api-ppd.html
+share/doc/cups/help/api-raster.html
+share/doc/cups/help/cgi.html
+share/doc/cups/help/glossary.html
+share/doc/cups/help/license.html
+share/doc/cups/help/man-accept.html
+share/doc/cups/help/man-backend.html
+share/doc/cups/help/man-cancel.html
+share/doc/cups/help/man-classes.conf.html
+share/doc/cups/help/man-client.conf.html
+share/doc/cups/help/man-cups-config.html
+share/doc/cups/help/man-cups-lpd.html
+share/doc/cups/help/man-cups-polld.html
+share/doc/cups/help/man-cupsaddsmb.html
+share/doc/cups/help/man-cupsd.conf.html
+share/doc/cups/help/man-filter.html
+share/doc/cups/help/man-mime.convs.html
+share/doc/cups/help/man-mime.types.html
+share/doc/cups/help/man-printers.conf.html
+share/doc/cups/help/network.html
+share/doc/cups/help/options.html
+share/doc/cups/help/overview.html
+share/doc/cups/help/ref-access_log.html
+share/doc/cups/help/ref-classes-conf.html
+share/doc/cups/help/ref-client-conf.html
+share/doc/cups/help/ref-cupsd-conf.html
+share/doc/cups/help/ref-error_log.html
+share/doc/cups/help/ref-page_log.html
+share/doc/cups/help/ref-printers-conf.html
+share/doc/cups/help/ref-snmp-conf.html
+share/doc/cups/help/ref-subscriptions-conf.html
+share/doc/cups/help/security.html
+share/doc/cups/help/spec-cmp.html
+share/doc/cups/help/spec-command.html
+share/doc/cups/help/spec-design.html
+share/doc/cups/help/spec-ipp.html
+share/doc/cups/help/spec-ppd.html
+share/doc/cups/help/spec-raster.html
+share/doc/cups/help/spec-stp.html
+share/doc/cups/help/standard.html
+share/doc/cups/help/translation.html
+share/doc/cups/help/whatsnew.html
+share/doc/cups/help/man-cupsd.html
+share/doc/cups/help/man-cupsenable.html
+share/doc/cups/help/man-cupstestdsc.html
+share/doc/cups/help/man-cupstestppd.html
+share/doc/cups/help/man-lp.html
+share/doc/cups/help/man-lpadmin.html
+share/doc/cups/help/man-lpc.html
+share/doc/cups/help/man-lpinfo.html
+share/doc/cups/help/man-lpmove.html
+share/doc/cups/help/man-lpoptions.html
+share/doc/cups/help/man-lppasswd.html
+share/doc/cups/help/man-lpq.html
+share/doc/cups/help/man-lpr.html
+share/doc/cups/help/man-lprm.html
+share/doc/cups/help/man-lpstat.html
+share/doc/cups/images/bottom-left.gif
+share/doc/cups/images/bottom-right.gif
+share/doc/cups/images/classes.gif
+share/doc/cups/images/cups-block-diagram.gif
+share/doc/cups/images/esp-logo.gif
+share/doc/cups/images/happy.gif
+share/doc/cups/images/logo.gif
+share/doc/cups/images/printer-idle.gif
+share/doc/cups/images/printer-processing.gif
+share/doc/cups/images/printer-stopped.gif
+share/doc/cups/images/smiley.jpg
+share/doc/cups/images/tab-left.gif
+share/doc/cups/images/tab-right.gif
+share/doc/cups/images/top-left.gif
+share/doc/cups/images/top-middle.gif
+share/doc/cups/images/top-right.gif
+share/doc/cups/images/web-add-this-printer.gif
+share/doc/cups/images/web-password.gif
+share/doc/cups/images/web-test-page.gif
+share/doc/cups/images/web-printer-driver.gif
+share/doc/cups/images/web-printer-status.gif
+share/doc/cups/images/web-set-printer-options.gif
+share/doc/cups/images/button-accept-jobs.gif
+share/doc/cups/images/button-add-class.gif
+share/doc/cups/images/button-add-printer.gif
+share/doc/cups/images/button-add-this-printer.gif
+share/doc/cups/images/button-cancel-all-jobs.gif
+share/doc/cups/images/button-cancel-job.gif
+share/doc/cups/images/button-change-settings.gif
+share/doc/cups/images/button-clean-print-heads.gif
+share/doc/cups/images/button-clear.gif
+share/doc/cups/images/button-continue.gif
+share/doc/cups/images/button-delete-class.gif
+share/doc/cups/images/button-delete-printer.gif
+share/doc/cups/images/button-edit-configuration-file.gif
+share/doc/cups/images/button-export-samba.gif
+share/doc/cups/images/button-help.gif
+share/doc/cups/images/button-hold-job.gif
+share/doc/cups/images/button-manage-classes.gif
+share/doc/cups/images/button-manage-jobs.gif
+share/doc/cups/images/button-manage-printers.gif
+share/doc/cups/images/button-manage-server.gif
+share/doc/cups/images/button-modify-class.gif
+share/doc/cups/images/button-modify-printer.gif
+share/doc/cups/images/button-move-job.gif
+share/doc/cups/images/button-move-jobs.gif
+share/doc/cups/images/button-print-self-test-page.gif
+share/doc/cups/images/button-print-test-page.gif
+share/doc/cups/images/button-publish-printer.gif
+share/doc/cups/images/button-reject-jobs.gif
+share/doc/cups/images/button-release-job.gif
+share/doc/cups/images/button-restart-job.gif
+share/doc/cups/images/button-save-changes.gif
+share/doc/cups/images/button-search.gif
+share/doc/cups/images/button-set-allowed-users.gif
+share/doc/cups/images/button-set-as-default.gif
+share/doc/cups/images/button-set-printer-options.gif
+share/doc/cups/images/button-show-active.gif
+share/doc/cups/images/button-show-all.gif
+share/doc/cups/images/button-show-completed.gif
+share/doc/cups/images/button-show-next.gif
+share/doc/cups/images/button-show-previous.gif
+share/doc/cups/images/button-sort-ascending.gif
+share/doc/cups/images/button-sort-descending.gif
+share/doc/cups/images/button-start-class.gif
+share/doc/cups/images/button-start-printer.gif
+share/doc/cups/images/button-stop-class.gif
+share/doc/cups/images/button-stop-printer.gif
+share/doc/cups/images/button-unpublish-printer.gif
+share/doc/cups/images/button-use-default-config.gif
+share/doc/cups/images/button-view-access-log.gif
+share/doc/cups/images/button-view-error-log.gif
+share/doc/cups/images/button-view-page-log.gif
+share/doc/cups/images/button-view-printable-version.gif
+share/doc/cups/es/images/button-accept-jobs.gif
+share/doc/cups/es/images/button-add-class.gif
+share/doc/cups/es/images/button-add-printer.gif
+share/doc/cups/es/images/button-add-this-printer.gif
+share/doc/cups/es/images/button-cancel-all-jobs.gif
+share/doc/cups/es/images/button-cancel-job.gif
+share/doc/cups/es/images/button-change-settings.gif
+share/doc/cups/es/images/button-clean-print-heads.gif
+share/doc/cups/es/images/button-clear.gif
+share/doc/cups/es/images/button-continue.gif
+share/doc/cups/es/images/button-delete-class.gif
+share/doc/cups/es/images/button-delete-printer.gif
+share/doc/cups/es/images/button-edit-configuration-file.gif
+share/doc/cups/es/images/button-export-samba.gif
+share/doc/cups/es/images/button-help.gif
+share/doc/cups/es/images/button-hold-job.gif
+share/doc/cups/es/images/button-manage-classes.gif
+share/doc/cups/es/images/button-manage-jobs.gif
+share/doc/cups/es/images/button-manage-printers.gif
+share/doc/cups/es/images/button-manage-server.gif
+share/doc/cups/es/images/button-modify-class.gif
+share/doc/cups/es/images/button-modify-printer.gif
+share/doc/cups/es/images/button-move-job.gif
+share/doc/cups/es/images/button-move-jobs.gif
+share/doc/cups/es/images/button-print-self-test-page.gif
+share/doc/cups/es/images/button-print-test-page.gif
+share/doc/cups/es/images/button-publish-printer.gif
+share/doc/cups/es/images/button-reject-jobs.gif
+share/doc/cups/es/images/button-release-job.gif
+share/doc/cups/es/images/button-restart-job.gif
+share/doc/cups/es/images/button-save-changes.gif
+share/doc/cups/es/images/button-search.gif
+share/doc/cups/es/images/button-set-allowed-users.gif
+share/doc/cups/es/images/button-set-as-default.gif
+share/doc/cups/es/images/button-set-printer-options.gif
+share/doc/cups/es/images/button-show-active.gif
+share/doc/cups/es/images/button-show-all.gif
+share/doc/cups/es/images/button-show-completed.gif
+share/doc/cups/es/images/button-show-next.gif
+share/doc/cups/es/images/button-show-previous.gif
+share/doc/cups/es/images/button-sort-ascending.gif
+share/doc/cups/es/images/button-sort-descending.gif
+share/doc/cups/es/images/button-start-class.gif
+share/doc/cups/es/images/button-start-printer.gif
+share/doc/cups/es/images/button-stop-class.gif
+share/doc/cups/es/images/button-stop-printer.gif
+share/doc/cups/es/images/button-unpublish-printer.gif
+share/doc/cups/es/images/button-use-default-config.gif
+share/doc/cups/es/images/button-view-access-log.gif
+share/doc/cups/es/images/button-view-error-log.gif
+share/doc/cups/es/images/button-view-page-log.gif
+share/doc/cups/es/images/button-view-printable-version.gif
+share/doc/cups/es/index.html
+share/doc/cups/ja/images/button-accept-jobs.gif
+share/doc/cups/ja/images/button-add-class.gif
+share/doc/cups/ja/images/button-add-printer.gif
+share/doc/cups/ja/images/button-add-this-printer.gif
+share/doc/cups/ja/images/button-cancel-all-jobs.gif
+share/doc/cups/ja/images/button-cancel-job.gif
+share/doc/cups/ja/images/button-change-settings.gif
+share/doc/cups/ja/images/button-continue.gif
+share/doc/cups/ja/images/button-delete-class.gif
+share/doc/cups/ja/images/button-delete-printer.gif
+share/doc/cups/ja/images/button-edit-configuration-file.gif
+share/doc/cups/ja/images/button-export-samba.gif
+share/doc/cups/ja/images/button-help.gif
+share/doc/cups/ja/images/button-hold-job.gif
+share/doc/cups/ja/images/button-move-job.gif
+share/doc/cups/ja/images/button-manage-classes.gif
+share/doc/cups/ja/images/button-manage-jobs.gif
+share/doc/cups/ja/images/button-manage-printers.gif
+share/doc/cups/ja/images/button-manage-server.gif
+share/doc/cups/ja/images/button-modify-class.gif
+share/doc/cups/ja/images/button-modify-printer.gif
+share/doc/cups/ja/images/button-move-jobs.gif
+share/doc/cups/ja/images/button-print-test-page.gif
+share/doc/cups/ja/images/button-publish-printer.gif
+share/doc/cups/ja/images/button-reject-jobs.gif
+share/doc/cups/ja/images/button-release-job.gif
+share/doc/cups/ja/images/button-restart-job.gif
+share/doc/cups/ja/images/button-save-changes.gif
+share/doc/cups/ja/images/button-search.gif
+share/doc/cups/ja/images/button-set-allowed-users.gif
+share/doc/cups/ja/images/button-set-as-default.gif
+share/doc/cups/ja/images/button-set-printer-options.gif
+share/doc/cups/ja/images/button-show-active.gif
+share/doc/cups/ja/images/button-show-all.gif
+share/doc/cups/ja/images/button-show-completed.gif
+share/doc/cups/ja/images/button-show-next.gif
+share/doc/cups/ja/images/button-show-previous.gif
+share/doc/cups/ja/images/button-sort-ascending.gif
+share/doc/cups/ja/images/button-sort-descending.gif
+share/doc/cups/ja/images/button-start-class.gif
+share/doc/cups/ja/images/button-start-printer.gif
+share/doc/cups/ja/images/button-stop-class.gif
+share/doc/cups/ja/images/button-stop-printer.gif
+share/doc/cups/ja/images/button-unpublish-printer.gif
+share/doc/cups/ja/images/button-use-default-config.gif
+share/doc/cups/ja/images/button-view-access-log.gif
+share/doc/cups/ja/images/button-view-error-log.gif
+share/doc/cups/ja/images/button-view-page-log.gif
+share/doc/cups/ja/index.html
+share/doc/cups/pl/images/button-accept-jobs.gif
+share/doc/cups/pl/images/button-add-class.gif
+share/doc/cups/pl/images/button-add-printer.gif
+share/doc/cups/pl/images/button-add-this-printer.gif
+share/doc/cups/pl/images/button-cancel-all-jobs.gif
+share/doc/cups/pl/images/button-cancel-job.gif
+share/doc/cups/pl/images/button-change-settings.gif
+share/doc/cups/pl/images/button-clean-print-heads.gif
+share/doc/cups/pl/images/button-clear.gif
+share/doc/cups/pl/images/button-continue.gif
+share/doc/cups/pl/images/button-delete-class.gif
+share/doc/cups/pl/images/button-delete-printer.gif
+share/doc/cups/pl/images/button-edit-configuration-file.gif
+share/doc/cups/pl/images/button-export-samba.gif
+share/doc/cups/pl/images/button-help.gif
+share/doc/cups/pl/images/button-hold-job.gif
+share/doc/cups/pl/images/button-manage-classes.gif
+share/doc/cups/pl/images/button-manage-jobs.gif
+share/doc/cups/pl/images/button-manage-printers.gif
+share/doc/cups/pl/images/button-manage-server.gif
+share/doc/cups/pl/images/button-modify-class.gif
+share/doc/cups/pl/images/button-modify-printer.gif
+share/doc/cups/pl/images/button-move-job.gif
+share/doc/cups/pl/images/button-move-jobs.gif
+share/doc/cups/pl/images/button-print-self-test-page.gif
+share/doc/cups/pl/images/button-print-test-page.gif
+share/doc/cups/pl/images/button-publish-printer.gif
+share/doc/cups/pl/images/button-reject-jobs.gif
+share/doc/cups/pl/images/button-release-job.gif
+share/doc/cups/pl/images/button-restart-job.gif
+share/doc/cups/pl/images/button-save-changes.gif
+share/doc/cups/pl/images/button-search.gif
+share/doc/cups/pl/images/button-set-allowed-users.gif
+share/doc/cups/pl/images/button-set-as-default.gif
+share/doc/cups/pl/images/button-set-printer-options.gif
+share/doc/cups/pl/images/button-show-active.gif
+share/doc/cups/pl/images/button-show-all.gif
+share/doc/cups/pl/images/button-show-completed.gif
+share/doc/cups/pl/images/button-show-next.gif
+share/doc/cups/pl/images/button-show-previous.gif
+share/doc/cups/pl/images/button-sort-ascending.gif
+share/doc/cups/pl/images/button-sort-descending.gif
+share/doc/cups/pl/images/button-start-class.gif
+share/doc/cups/pl/images/button-start-printer.gif
+share/doc/cups/pl/images/button-stop-class.gif
+share/doc/cups/pl/images/button-stop-printer.gif
+share/doc/cups/pl/images/button-unpublish-printer.gif
+share/doc/cups/pl/images/button-use-default-config.gif
+share/doc/cups/pl/images/button-view-access-log.gif
+share/doc/cups/pl/images/button-view-error-log.gif
+share/doc/cups/pl/images/button-view-page-log.gif
+share/doc/cups/pl/images/button-view-printable-version.gif
+share/doc/cups/pl/index.html
+share/doc/cups/sv/images/button-accept-jobs.gif
+share/doc/cups/sv/images/button-add-class.gif
+share/doc/cups/sv/images/button-add-printer.gif
+share/doc/cups/sv/images/button-add-this-printer.gif
+share/doc/cups/sv/images/button-cancel-all-jobs.gif
+share/doc/cups/sv/images/button-cancel-job.gif
+share/doc/cups/sv/images/button-change-settings.gif
+share/doc/cups/sv/images/button-clean-print-heads.gif
+share/doc/cups/sv/images/button-clear.gif
+share/doc/cups/sv/images/button-continue.gif
+share/doc/cups/sv/images/button-delete-class.gif
+share/doc/cups/sv/images/button-delete-printer.gif
+share/doc/cups/sv/images/button-edit-configuration-file.gif
+share/doc/cups/sv/images/button-export-samba.gif
+share/doc/cups/sv/images/button-help.gif
+share/doc/cups/sv/images/button-hold-job.gif
+share/doc/cups/sv/images/button-manage-classes.gif
+share/doc/cups/sv/images/button-manage-jobs.gif
+share/doc/cups/sv/images/button-manage-printers.gif
+share/doc/cups/sv/images/button-manage-server.gif
+share/doc/cups/sv/images/button-modify-class.gif
+share/doc/cups/sv/images/button-modify-printer.gif
+share/doc/cups/sv/images/button-move-job.gif
+share/doc/cups/sv/images/button-move-jobs.gif
+share/doc/cups/sv/images/button-print-self-test-page.gif
+share/doc/cups/sv/images/button-print-test-page.gif
+share/doc/cups/sv/images/button-publish-printer.gif
+share/doc/cups/sv/images/button-reject-jobs.gif
+share/doc/cups/sv/images/button-release-job.gif
+share/doc/cups/sv/images/button-restart-job.gif
+share/doc/cups/sv/images/button-save-changes.gif
+share/doc/cups/sv/images/button-search.gif
+share/doc/cups/sv/images/button-set-allowed-users.gif
+share/doc/cups/sv/images/button-set-as-default.gif
+share/doc/cups/sv/images/button-set-printer-options.gif
+share/doc/cups/sv/images/button-show-active.gif
+share/doc/cups/sv/images/button-show-all.gif
+share/doc/cups/sv/images/button-show-completed.gif
+share/doc/cups/sv/images/button-show-next.gif
+share/doc/cups/sv/images/button-show-previous.gif
+share/doc/cups/sv/images/button-sort-ascending.gif
+share/doc/cups/sv/images/button-sort-descending.gif
+share/doc/cups/sv/images/button-start-class.gif
+share/doc/cups/sv/images/button-start-printer.gif
+share/doc/cups/sv/images/button-stop-class.gif
+share/doc/cups/sv/images/button-stop-printer.gif
+share/doc/cups/sv/images/button-unpublish-printer.gif
+share/doc/cups/sv/images/button-use-default-config.gif
+share/doc/cups/sv/images/button-view-access-log.gif
+share/doc/cups/sv/images/button-view-error-log.gif
+share/doc/cups/sv/images/button-view-page-log.gif
+share/doc/cups/sv/images/button-view-printable-version.gif
+share/doc/cups/sv/index.html
+share/locale/es/cups_es.po
+share/locale/ja/cups_ja.po
+share/locale/sv/cups_sv.po
 share/cups/banners/classified
 share/cups/banners/confidential
 share/cups/banners/secret
 share/cups/banners/standard
 share/cups/banners/topsecret
 share/cups/banners/unclassified
+share/cups/charmaps/euc-cn.txt
+share/cups/charmaps/euc-jp.txt
+share/cups/charmaps/euc-kr.txt
+share/cups/charmaps/euc-tw.txt
+share/cups/charmaps/iso-8859-10.txt
+share/cups/charmaps/iso-8859-11.txt
+share/cups/charmaps/iso-8859-13.txt
+share/cups/charmaps/iso-8859-14.txt
+share/cups/charmaps/iso-8859-15.txt
+share/cups/charmaps/iso-8859-16.txt
+share/cups/charmaps/iso-8859-1.txt
+share/cups/charmaps/iso-8859-2.txt
+share/cups/charmaps/iso-8859-3.txt
+share/cups/charmaps/iso-8859-4.txt
+share/cups/charmaps/iso-8859-5.txt
+share/cups/charmaps/iso-8859-6.txt
+share/cups/charmaps/iso-8859-7.txt
+share/cups/charmaps/iso-8859-8.txt
+share/cups/charmaps/iso-8859-9.txt
+share/cups/charmaps/koi8-r.txt
+share/cups/charmaps/koi8-u.txt
+share/cups/charmaps/mac-roman.txt
+share/cups/charmaps/windows-1250.txt
+share/cups/charmaps/windows-1251.txt
+share/cups/charmaps/windows-1252.txt
+share/cups/charmaps/windows-1253.txt
+share/cups/charmaps/windows-1254.txt
+share/cups/charmaps/windows-1255.txt
+share/cups/charmaps/windows-1256.txt
+share/cups/charmaps/windows-1257.txt
+share/cups/charmaps/windows-1258.txt
+share/cups/charmaps/windows-1361.txt
+share/cups/charmaps/windows-874.txt
+share/cups/charmaps/windows-932.txt
+share/cups/charmaps/windows-936.txt
+share/cups/charmaps/windows-949.txt
+share/cups/charmaps/windows-950.txt
+share/cups/charsets/windows-874
+share/cups/charsets/windows-1250
+share/cups/charsets/windows-1251
+share/cups/charsets/windows-1252
+share/cups/charsets/windows-1253
+share/cups/charsets/windows-1254
+share/cups/charsets/windows-1255
+share/cups/charsets/windows-1256
+share/cups/charsets/windows-1257
+share/cups/charsets/windows-1258
+share/cups/charsets/koi8-r
+share/cups/charsets/koi8-u
 share/cups/charsets/iso-8859-1
-share/cups/charsets/iso-8859-10
-share/cups/charsets/iso-8859-13
-share/cups/charsets/iso-8859-14
-share/cups/charsets/iso-8859-15
 share/cups/charsets/iso-8859-2
 share/cups/charsets/iso-8859-3
 share/cups/charsets/iso-8859-4
@@ -78,129 +465,82 @@ share/cups/charsets/iso-8859-6
 share/cups/charsets/iso-8859-7
 share/cups/charsets/iso-8859-8
 share/cups/charsets/iso-8859-9
-share/cups/charsets/koi8-r
-share/cups/charsets/koi8-u
+share/cups/charsets/iso-8859-10
+share/cups/charsets/iso-8859-13
+share/cups/charsets/iso-8859-14
+share/cups/charsets/iso-8859-15
 share/cups/charsets/utf-8
-share/cups/charsets/windows-1250
-share/cups/charsets/windows-1251
-share/cups/charsets/windows-1252
-share/cups/charsets/windows-1253
-share/cups/charsets/windows-1254
-share/cups/charsets/windows-1255
-share/cups/charsets/windows-1256
-share/cups/charsets/windows-1257
-share/cups/charsets/windows-1258
-share/cups/charsets/windows-874
-share/cups/data/HPGLprolog
-share/cups/data/psglyphs
-share/cups/data/testprint.ps
-share/cups/fonts/Courier
-share/cups/fonts/Courier-Bold
-share/cups/fonts/Courier-BoldOblique
-share/cups/fonts/Courier-Oblique
-share/cups/fonts/Symbol
 share/cups/model/deskjet.ppd
 share/cups/model/deskjet2.ppd
 share/cups/model/dymo.ppd
-share/cups/model/epson24.ppd
 share/cups/model/epson9.ppd
+share/cups/model/epson24.ppd
 share/cups/model/laserjet.ppd
-share/cups/model/okidat24.ppd
 share/cups/model/okidata9.ppd
+share/cups/model/okidat24.ppd
 share/cups/model/stcolor.ppd
 share/cups/model/stcolor2.ppd
 share/cups/model/stphoto.ppd
 share/cups/model/stphoto2.ppd
 share/cups/model/zebra.ppd
+share/cups/model/zebraep1.ppd
+share/cups/model/zebraep2.ppd
+share/cups/data/HPGLprolog
+share/cups/data/psglyphs
+share/cups/data/testprint.ps
+share/cups/fonts/Courier
+share/cups/fonts/Courier-Bold
+share/cups/fonts/Courier-BoldOblique
+share/cups/fonts/Courier-Oblique
+share/cups/fonts/Symbol
 share/cups/templates/add-class.tmpl
 share/cups/templates/add-printer.tmpl
-share/cups/templates/admin-op.tmpl
 share/cups/templates/admin.tmpl
 share/cups/templates/choose-device.tmpl
 share/cups/templates/choose-make.tmpl
-share/cups/templates/choose-members.tmpl
 share/cups/templates/choose-model.tmpl
 share/cups/templates/choose-serial.tmpl
 share/cups/templates/choose-uri.tmpl
 share/cups/templates/class-added.tmpl
 share/cups/templates/class-confirm.tmpl
 share/cups/templates/class-deleted.tmpl
+share/cups/templates/class-jobs-header.tmpl
 share/cups/templates/class-modified.tmpl
 share/cups/templates/classes.tmpl
-share/cups/templates/config-printer.tmpl
-share/cups/templates/config-printer2.tmpl
-share/cups/templates/printer-default.tmpl
-share/cups/templates/be/add-class.tmpl
-share/cups/templates/be/add-printer.tmpl
-share/cups/templates/be/admin-op.tmpl
-share/cups/templates/be/admin.tmpl
-share/cups/templates/be/choose-device.tmpl
-share/cups/templates/be/choose-make.tmpl
-share/cups/templates/be/choose-members.tmpl
-share/cups/templates/be/choose-model.tmpl
-share/cups/templates/be/choose-serial.tmpl
-share/cups/templates/be/choose-uri.tmpl
-share/cups/templates/be/class-added.tmpl
-share/cups/templates/be/class-confirm.tmpl
-share/cups/templates/be/class-deleted.tmpl
-share/cups/templates/be/class-modified.tmpl
-share/cups/templates/be/classes.tmpl
-share/cups/templates/be/config-printer.tmpl
-share/cups/templates/be/config-printer2.tmpl
-share/cups/templates/be/error.tmpl
-share/cups/templates/be/header.tmpl
-share/cups/templates/be/jobs.tmpl
-share/cups/templates/be/job-cancel.tmpl
-share/cups/templates/be/job-hold.tmpl
-share/cups/templates/be/job-op.tmpl
-share/cups/templates/be/job-release.tmpl
-share/cups/templates/be/job-restart.tmpl
-share/cups/templates/be/modify-class.tmpl
-share/cups/templates/be/modify-printer.tmpl
-share/cups/templates/be/option-boolean.tmpl
-share/cups/templates/be/option-conflict.tmpl
-share/cups/templates/be/option-header.tmpl
-share/cups/templates/be/option-pickmany.tmpl
-share/cups/templates/be/option-pickone.tmpl
-share/cups/templates/be/option-trailer.tmpl
-share/cups/templates/be/printers.tmpl
-share/cups/templates/be/printer-accept.tmpl
-share/cups/templates/be/printer-added.tmpl
-share/cups/templates/be/printer-configured.tmpl
-share/cups/templates/be/printer-confirm.tmpl
-share/cups/templates/be/printer-deleted.tmpl
-share/cups/templates/be/printer-modified.tmpl
-share/cups/templates/be/printer-purge.tmpl
-share/cups/templates/be/printer-reject.tmpl
-share/cups/templates/be/printer-start.tmpl
-share/cups/templates/be/printer-stop.tmpl
-share/cups/templates/be/test-page.tmpl
-share/cups/templates/be/trailer.tmpl
+share/cups/templates/classes-header.tmpl
+share/cups/templates/edit-config.tmpl
+share/cups/templates/error.tmpl
+share/cups/templates/error-op.tmpl
 share/cups/templates/es/add-class.tmpl
 share/cups/templates/es/add-printer.tmpl
-share/cups/templates/es/admin-op.tmpl
 share/cups/templates/es/admin.tmpl
 share/cups/templates/es/choose-device.tmpl
 share/cups/templates/es/choose-make.tmpl
-share/cups/templates/es/choose-members.tmpl
 share/cups/templates/es/choose-model.tmpl
 share/cups/templates/es/choose-serial.tmpl
 share/cups/templates/es/choose-uri.tmpl
 share/cups/templates/es/class-added.tmpl
 share/cups/templates/es/class-confirm.tmpl
 share/cups/templates/es/class-deleted.tmpl
+share/cups/templates/es/class-jobs-header.tmpl
 share/cups/templates/es/class-modified.tmpl
 share/cups/templates/es/classes.tmpl
-share/cups/templates/es/config-printer.tmpl
-share/cups/templates/es/config-printer2.tmpl
+share/cups/templates/es/classes-header.tmpl
+share/cups/templates/es/edit-config.tmpl
 share/cups/templates/es/error.tmpl
+share/cups/templates/es/error-op.tmpl
 share/cups/templates/es/header.tmpl
-share/cups/templates/es/jobs.tmpl
+share/cups/templates/es/help-header.tmpl
+share/cups/templates/es/help-printable.tmpl
 share/cups/templates/es/job-cancel.tmpl
 share/cups/templates/es/job-hold.tmpl
-share/cups/templates/es/job-op.tmpl
+share/cups/templates/es/job-move.tmpl
+share/cups/templates/es/job-moved.tmpl
 share/cups/templates/es/job-release.tmpl
 share/cups/templates/es/job-restart.tmpl
+share/cups/templates/es/jobs.tmpl
+share/cups/templates/es/jobs-header.tmpl
+share/cups/templates/es/maintenance.tmpl
 share/cups/templates/es/modify-class.tmpl
 share/cups/templates/es/modify-printer.tmpl
 share/cups/templates/es/option-boolean.tmpl
@@ -209,119 +549,42 @@ share/cups/templates/es/option-header.tmpl
 share/cups/templates/es/option-pickmany.tmpl
 share/cups/templates/es/option-pickone.tmpl
 share/cups/templates/es/option-trailer.tmpl
-share/cups/templates/es/printers.tmpl
+share/cups/templates/es/pager.tmpl
 share/cups/templates/es/printer-accept.tmpl
 share/cups/templates/es/printer-added.tmpl
 share/cups/templates/es/printer-configured.tmpl
 share/cups/templates/es/printer-confirm.tmpl
+share/cups/templates/es/printer-default.tmpl
 share/cups/templates/es/printer-deleted.tmpl
+share/cups/templates/es/printer-jobs-header.tmpl
 share/cups/templates/es/printer-modified.tmpl
 share/cups/templates/es/printer-purge.tmpl
 share/cups/templates/es/printer-reject.tmpl
 share/cups/templates/es/printer-start.tmpl
 share/cups/templates/es/printer-stop.tmpl
+share/cups/templates/es/printers.tmpl
+share/cups/templates/es/printers-header.tmpl
+share/cups/templates/es/restart.tmpl
+share/cups/templates/es/search.tmpl
+share/cups/templates/es/samba-export.tmpl
+share/cups/templates/es/samba-exported.tmpl
+share/cups/templates/es/set-printer-options-header.tmpl
+share/cups/templates/es/set-printer-options-trailer.tmpl
 share/cups/templates/es/test-page.tmpl
 share/cups/templates/es/trailer.tmpl
-share/cups/templates/de/add-class.tmpl
-share/cups/templates/de/add-printer.tmpl
-share/cups/templates/de/admin-op.tmpl
-share/cups/templates/de/admin.tmpl
-share/cups/templates/de/choose-device.tmpl
-share/cups/templates/de/choose-make.tmpl
-share/cups/templates/de/choose-members.tmpl
-share/cups/templates/de/choose-model.tmpl
-share/cups/templates/de/choose-serial.tmpl
-share/cups/templates/de/choose-uri.tmpl
-share/cups/templates/de/class-added.tmpl
-share/cups/templates/de/class-confirm.tmpl
-share/cups/templates/de/class-deleted.tmpl
-share/cups/templates/de/class-modified.tmpl
-share/cups/templates/de/classes.tmpl
-share/cups/templates/de/config-printer.tmpl
-share/cups/templates/de/config-printer2.tmpl
-share/cups/templates/de/error.tmpl
-share/cups/templates/de/header.tmpl
-share/cups/templates/de/job-cancel.tmpl
-share/cups/templates/de/job-hold.tmpl
-share/cups/templates/de/job-op.tmpl
-share/cups/templates/de/job-release.tmpl
-share/cups/templates/de/job-restart.tmpl
-share/cups/templates/de/jobs.tmpl
-share/cups/templates/de/modify-class.tmpl
-share/cups/templates/de/modify-printer.tmpl
-share/cups/templates/de/option-boolean.tmpl
-share/cups/templates/de/option-conflict.tmpl
-share/cups/templates/de/option-header.tmpl
-share/cups/templates/de/option-pickmany.tmpl
-share/cups/templates/de/option-pickone.tmpl
-share/cups/templates/de/option-trailer.tmpl
-share/cups/templates/de/printer-accept.tmpl
-share/cups/templates/de/printer-added.tmpl
-share/cups/templates/de/printer-configured.tmpl
-share/cups/templates/de/printer-confirm.tmpl
-share/cups/templates/de/printer-deleted.tmpl
-share/cups/templates/de/printer-modified.tmpl
-share/cups/templates/de/printer-purge.tmpl
-share/cups/templates/de/printer-reject.tmpl
-share/cups/templates/de/printer-start.tmpl
-share/cups/templates/de/printer-stop.tmpl
-share/cups/templates/de/printers.tmpl
-share/cups/templates/de/test-page.tmpl
-share/cups/templates/de/trailer.tmpl
-share/cups/templates/error.tmpl
-share/cups/templates/fr/add-class.tmpl
-share/cups/templates/fr/add-printer.tmpl
-share/cups/templates/fr/admin-op.tmpl
-share/cups/templates/fr/admin.tmpl
-share/cups/templates/fr/choose-device.tmpl
-share/cups/templates/fr/choose-make.tmpl
-share/cups/templates/fr/choose-members.tmpl
-share/cups/templates/fr/choose-model.tmpl
-share/cups/templates/fr/choose-serial.tmpl
-share/cups/templates/fr/choose-uri.tmpl
-share/cups/templates/fr/class-added.tmpl
-share/cups/templates/fr/class-confirm.tmpl
-share/cups/templates/fr/class-deleted.tmpl
-share/cups/templates/fr/class-modified.tmpl
-share/cups/templates/fr/classes.tmpl
-share/cups/templates/fr/config-printer.tmpl
-share/cups/templates/fr/config-printer2.tmpl
-share/cups/templates/fr/error.tmpl
-share/cups/templates/fr/header.tmpl
-share/cups/templates/fr/job-cancel.tmpl
-share/cups/templates/fr/job-hold.tmpl
-share/cups/templates/fr/job-op.tmpl
-share/cups/templates/fr/job-release.tmpl
-share/cups/templates/fr/job-restart.tmpl
-share/cups/templates/fr/jobs.tmpl
-share/cups/templates/fr/modify-class.tmpl
-share/cups/templates/fr/modify-printer.tmpl
-share/cups/templates/fr/option-boolean.tmpl
-share/cups/templates/fr/option-conflict.tmpl
-share/cups/templates/fr/option-header.tmpl
-share/cups/templates/fr/option-pickmany.tmpl
-share/cups/templates/fr/option-pickone.tmpl
-share/cups/templates/fr/option-trailer.tmpl
-share/cups/templates/fr/printer-accept.tmpl
-share/cups/templates/fr/printer-added.tmpl
-share/cups/templates/fr/printer-configured.tmpl
-share/cups/templates/fr/printer-confirm.tmpl
-share/cups/templates/fr/printer-deleted.tmpl
-share/cups/templates/fr/printer-modified.tmpl
-share/cups/templates/fr/printer-purge.tmpl
-share/cups/templates/fr/printer-reject.tmpl
-share/cups/templates/fr/printer-start.tmpl
-share/cups/templates/fr/printer-stop.tmpl
-share/cups/templates/fr/printers.tmpl
-share/cups/templates/fr/test-page.tmpl
-share/cups/templates/fr/trailer.tmpl
+share/cups/templates/es/users.tmpl
 share/cups/templates/header.tmpl
+share/cups/templates/help-header.tmpl
+share/cups/templates/help-printable.tmpl
 share/cups/templates/job-cancel.tmpl
 share/cups/templates/job-hold.tmpl
-share/cups/templates/job-op.tmpl
+share/cups/templates/job-move.tmpl
+share/cups/templates/job-moved.tmpl
 share/cups/templates/job-release.tmpl
 share/cups/templates/job-restart.tmpl
 share/cups/templates/jobs.tmpl
+share/cups/templates/jobs-header.tmpl
+share/cups/templates/maintenance.tmpl
 share/cups/templates/modify-class.tmpl
 share/cups/templates/modify-printer.tmpl
 share/cups/templates/option-boolean.tmpl
@@ -330,277 +593,287 @@ share/cups/templates/option-header.tmpl
 share/cups/templates/option-pickmany.tmpl
 share/cups/templates/option-pickone.tmpl
 share/cups/templates/option-trailer.tmpl
+share/cups/templates/pager.tmpl
 share/cups/templates/printer-accept.tmpl
 share/cups/templates/printer-added.tmpl
 share/cups/templates/printer-configured.tmpl
 share/cups/templates/printer-confirm.tmpl
+share/cups/templates/printer-default.tmpl
 share/cups/templates/printer-deleted.tmpl
+share/cups/templates/printer-jobs-header.tmpl
 share/cups/templates/printer-modified.tmpl
 share/cups/templates/printer-purge.tmpl
 share/cups/templates/printer-reject.tmpl
 share/cups/templates/printer-start.tmpl
 share/cups/templates/printer-stop.tmpl
 share/cups/templates/printers.tmpl
+share/cups/templates/printers-header.tmpl
+share/cups/templates/restart.tmpl
+share/cups/templates/search.tmpl
+share/cups/templates/samba-export.tmpl
+share/cups/templates/samba-exported.tmpl
+share/cups/templates/set-printer-options-header.tmpl
+share/cups/templates/set-printer-options-trailer.tmpl
 share/cups/templates/test-page.tmpl
 share/cups/templates/trailer.tmpl
-share/doc/cups/cmp.html
-share/doc/cups/cmp.pdf
-share/doc/cups/cups.css
-share/doc/cups/cupsdoc.css
-share/doc/cups/be/index.html
-share/doc/cups/be/documentation.html
-share/doc/cups/be/images/accept-jobs.gif
-share/doc/cups/be/images/add-class.gif
-share/doc/cups/be/images/add-printer.gif
-share/doc/cups/be/images/cancel-job.gif
-share/doc/cups/be/images/config-printer.gif
-share/doc/cups/be/images/continue.gif
-share/doc/cups/be/images/delete-class.gif
-share/doc/cups/be/images/delete-printer.gif
-share/doc/cups/be/images/hold-job.gif
-share/doc/cups/be/images/manage-classes.gif
-share/doc/cups/be/images/manage-jobs.gif
-share/doc/cups/be/images/manage-printers.gif
-share/doc/cups/be/images/modify-class.gif
-share/doc/cups/be/images/modify-printer.gif
-share/doc/cups/be/images/navbar.gif
-share/doc/cups/be/images/print-test-page.gif
-share/doc/cups/be/images/reject-jobs.gif
-share/doc/cups/be/images/release-job.gif
-share/doc/cups/be/images/restart-job.gif
-share/doc/cups/be/images/show-active.gif
-share/doc/cups/be/images/show-completed.gif
-share/doc/cups/be/images/start-class.gif
-share/doc/cups/be/images/start-printer.gif
-share/doc/cups/be/images/stop-class.gif
-share/doc/cups/be/images/stop-printer.gif
-share/doc/cups/es/index.html
-share/doc/cups/es/documentation.html
-share/doc/cups/es/images/accept-jobs.gif
-share/doc/cups/es/images/add-class.gif
-share/doc/cups/es/images/add-printer.gif
-share/doc/cups/es/images/cancel-job.gif
-share/doc/cups/es/images/config-printer.gif
-share/doc/cups/es/images/continue.gif
-share/doc/cups/es/images/delete-class.gif
-share/doc/cups/es/images/delete-printer.gif
-share/doc/cups/es/images/hold-job.gif
-share/doc/cups/es/images/manage-classes.gif
-share/doc/cups/es/images/manage-jobs.gif
-share/doc/cups/es/images/manage-printers.gif
-share/doc/cups/es/images/modify-class.gif
-share/doc/cups/es/images/modify-printer.gif
-share/doc/cups/es/images/navbar.gif
-share/doc/cups/es/images/print-test-page.gif
-share/doc/cups/es/images/reject-jobs.gif
-share/doc/cups/es/images/release-job.gif
-share/doc/cups/es/images/restart-job.gif
-share/doc/cups/es/images/set-as-default.gif
-share/doc/cups/es/images/show-active.gif
-share/doc/cups/es/images/show-completed.gif
-share/doc/cups/es/images/start-class.gif
-share/doc/cups/es/images/start-printer.gif
-share/doc/cups/es/images/stop-class.gif
-share/doc/cups/es/images/stop-printer.gif
-share/doc/cups/de/documentation.html
-share/doc/cups/de/images/accept-jobs.gif
-share/doc/cups/de/images/add-class.gif
-share/doc/cups/de/images/add-printer.gif
-share/doc/cups/de/images/cancel-job.gif
-share/doc/cups/de/images/config-printer.gif
-share/doc/cups/de/images/continue.gif
-share/doc/cups/de/images/delete-class.gif
-share/doc/cups/de/images/delete-printer.gif
-share/doc/cups/de/images/hold-job.gif
-share/doc/cups/de/images/manage-classes.gif
-share/doc/cups/de/images/manage-jobs.gif
-share/doc/cups/de/images/manage-printers.gif
-share/doc/cups/de/images/modify-class.gif
-share/doc/cups/de/images/modify-printer.gif
-share/doc/cups/de/images/navbar.gif
-share/doc/cups/de/images/print-test-page.gif
-share/doc/cups/de/images/reject-jobs.gif
-share/doc/cups/de/images/release-job.gif
-share/doc/cups/de/images/restart-job.gif
-share/doc/cups/de/images/show-active.gif
-share/doc/cups/de/images/show-completed.gif
-share/doc/cups/de/images/start-class.gif
-share/doc/cups/de/images/start-printer.gif
-share/doc/cups/de/images/stop-class.gif
-share/doc/cups/de/images/stop-printer.gif
-share/doc/cups/de/index.html
-share/doc/cups/documentation.html
-share/doc/cups/fr/cups.css
-share/doc/cups/fr/cupsdoc.css
-share/doc/cups/fr/documentation.html
-share/doc/cups/fr/images/accept-jobs.gif
-share/doc/cups/fr/images/add-class.gif
-share/doc/cups/fr/images/add-printer.gif
-share/doc/cups/fr/images/cancel-job.gif
-share/doc/cups/fr/images/config-printer.gif
-share/doc/cups/fr/images/continue.gif
-share/doc/cups/fr/images/delete-class.gif
-share/doc/cups/fr/images/delete-printer.gif
-share/doc/cups/fr/images/hold-job.gif
-share/doc/cups/fr/images/manage-classes.gif
-share/doc/cups/fr/images/manage-jobs.gif
-share/doc/cups/fr/images/manage-printers.gif
-share/doc/cups/fr/images/modify-class.gif
-share/doc/cups/fr/images/modify-printer.gif
-share/doc/cups/fr/images/navbar.gif
-share/doc/cups/fr/images/print-test-page.gif
-share/doc/cups/fr/images/reject-jobs.gif
-share/doc/cups/fr/images/release-job.gif
-share/doc/cups/fr/images/restart-job.gif
-share/doc/cups/fr/images/show-active.gif
-share/doc/cups/fr/images/show-completed.gif
-share/doc/cups/fr/images/start-class.gif
-share/doc/cups/fr/images/start-printer.gif
-share/doc/cups/fr/images/stop-class.gif
-share/doc/cups/fr/images/stop-printer.gif
-share/doc/cups/fr/index.html
-share/doc/cups/fr/overview.html
-share/doc/cups/fr/overview.pdf
-share/doc/cups/fr/sam.html
-share/doc/cups/fr/sam.pdf
-share/doc/cups/fr/sum.html
-share/doc/cups/fr/sum.pdf
-share/doc/cups/idd.html
-share/doc/cups/idd.pdf
-share/doc/cups/images/accept-jobs.gif
-share/doc/cups/images/add-class.gif
-share/doc/cups/images/add-printer.gif
-share/doc/cups/images/cancel-job.gif
-share/doc/cups/images/classes.gif
-share/doc/cups/images/config-printer.gif
-share/doc/cups/images/continue.gif
-share/doc/cups/images/cups-block-diagram.gif
-share/doc/cups/images/cups-large.gif
-share/doc/cups/images/cups-medium.gif
-share/doc/cups/images/cups-small.gif
-share/doc/cups/images/delete-class.gif
-share/doc/cups/images/delete-printer.gif
-share/doc/cups/images/hold-job.gif
-share/doc/cups/images/left.gif
-share/doc/cups/images/logo.gif
-share/doc/cups/images/manage-classes.gif
-share/doc/cups/images/manage-jobs.gif
-share/doc/cups/images/manage-printers.gif
-share/doc/cups/images/modify-class.gif
-share/doc/cups/images/modify-printer.gif
-share/doc/cups/images/navbar.gif
-share/doc/cups/images/print-test-page.gif
-share/doc/cups/images/printer-idle.gif
-share/doc/cups/images/printer-processing.gif
-share/doc/cups/images/printer-stopped.gif
-share/doc/cups/images/reject-jobs.gif
-share/doc/cups/images/release-job.gif
-share/doc/cups/images/restart-job.gif
-share/doc/cups/images/right.gif
-share/doc/cups/images/set-as-default.gif
-share/doc/cups/images/show-active.gif
-share/doc/cups/images/show-completed.gif
-share/doc/cups/images/start-class.gif
-share/doc/cups/images/start-printer.gif
-share/doc/cups/images/stop-class.gif
-share/doc/cups/images/stop-printer.gif
-share/doc/cups/index.html
-share/doc/cups/ipp.html
-share/doc/cups/ipp.pdf
-share/doc/cups/overview.html
-share/doc/cups/overview.pdf
-share/doc/cups/robots.txt
-share/doc/cups/sam.html
-share/doc/cups/sam.pdf
-share/doc/cups/sdd.html
-share/doc/cups/sdd.pdf
-share/doc/cups/spm.html
-share/doc/cups/spm.pdf
-share/doc/cups/sps.html
-share/doc/cups/sps.pdf
-share/doc/cups/ssr.html
-share/doc/cups/ssr.pdf
-share/doc/cups/stp.html
-share/doc/cups/stp.pdf
-share/doc/cups/sum.html
-share/doc/cups/sum.pdf
-share/doc/cups/svd.html
-share/doc/cups/svd.pdf
-share/doc/cups/translation.html
-share/doc/cups/translation.pdf
-share/locale/C/cups_C
-share/locale/be/cups_be
-share/locale/cs/cups_cs
-share/locale/de/cups_de
-share/locale/en/cups_en
-share/locale/en_US/cups_en_US
-share/locale/es/cups_es
-share/locale/fr/cups_fr
-share/locale/he/cups_he
-share/locale/it/cups_it
-share/locale/ru_RU/cups_ru_RU
-share/locale/sv/cups_sv
-share/locale/uk/cups_uk
-share/locale/uk_UA/cups_uk_UA
-share/locale/zh_CN/cups_zh_CN
-@dirrmtry man/fr/man8
-@dirrmtry man/fr/man5
-@dirrmtry man/fr/man1
-@dirrmtry man/fr
-@dirrmtry man/es/man8
-@dirrmtry man/es/man5
-@dirrmtry man/es/man1
-@dirrmtry man/es
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk_UA
-@dirrmtry share/locale/uk
+share/cups/templates/users.tmpl
+share/cups/templates/ja/add-class.tmpl
+share/cups/templates/ja/add-printer.tmpl
+share/cups/templates/ja/admin.tmpl
+share/cups/templates/ja/choose-device.tmpl
+share/cups/templates/ja/choose-make.tmpl
+share/cups/templates/ja/choose-model.tmpl
+share/cups/templates/ja/choose-serial.tmpl
+share/cups/templates/ja/choose-uri.tmpl
+share/cups/templates/ja/class-added.tmpl
+share/cups/templates/ja/class-confirm.tmpl
+share/cups/templates/ja/class-deleted.tmpl
+share/cups/templates/ja/class-jobs-header.tmpl
+share/cups/templates/ja/class-modified.tmpl
+share/cups/templates/ja/classes.tmpl
+share/cups/templates/ja/classes-header.tmpl
+share/cups/templates/ja/edit-config.tmpl
+share/cups/templates/ja/error.tmpl
+share/cups/templates/ja/error-op.tmpl
+share/cups/templates/ja/header.tmpl
+share/cups/templates/ja/help-header.tmpl
+share/cups/templates/ja/job-cancel.tmpl
+share/cups/templates/ja/job-hold.tmpl
+share/cups/templates/ja/job-move.tmpl
+share/cups/templates/ja/job-moved.tmpl
+share/cups/templates/ja/job-release.tmpl
+share/cups/templates/ja/job-restart.tmpl
+share/cups/templates/ja/jobs.tmpl
+share/cups/templates/ja/jobs-header.tmpl
+share/cups/templates/ja/maintenance.tmpl
+share/cups/templates/ja/modify-class.tmpl
+share/cups/templates/ja/modify-printer.tmpl
+share/cups/templates/ja/option-conflict.tmpl
+share/cups/templates/ja/option-trailer.tmpl
+share/cups/templates/ja/pager.tmpl
+share/cups/templates/ja/printer-accept.tmpl
+share/cups/templates/ja/printer-added.tmpl
+share/cups/templates/ja/printer-configured.tmpl
+share/cups/templates/ja/printer-confirm.tmpl
+share/cups/templates/ja/printer-default.tmpl
+share/cups/templates/ja/printer-deleted.tmpl
+share/cups/templates/ja/printer-jobs-header.tmpl
+share/cups/templates/ja/printer-modified.tmpl
+share/cups/templates/ja/printer-purge.tmpl
+share/cups/templates/ja/printer-reject.tmpl
+share/cups/templates/ja/printer-start.tmpl
+share/cups/templates/ja/printer-stop.tmpl
+share/cups/templates/ja/printers.tmpl
+share/cups/templates/ja/printers-header.tmpl
+share/cups/templates/ja/restart.tmpl
+share/cups/templates/ja/samba-export.tmpl
+share/cups/templates/ja/samba-exported.tmpl
+share/cups/templates/ja/search.tmpl
+share/cups/templates/ja/test-page.tmpl
+share/cups/templates/ja/users.tmpl
+share/cups/templates/pl/add-class.tmpl
+share/cups/templates/pl/add-printer.tmpl
+share/cups/templates/pl/admin.tmpl
+share/cups/templates/pl/choose-device.tmpl
+share/cups/templates/pl/choose-make.tmpl
+share/cups/templates/pl/choose-model.tmpl
+share/cups/templates/pl/choose-serial.tmpl
+share/cups/templates/pl/choose-uri.tmpl
+share/cups/templates/pl/class-added.tmpl
+share/cups/templates/pl/class-confirm.tmpl
+share/cups/templates/pl/class-deleted.tmpl
+share/cups/templates/pl/class-jobs-header.tmpl
+share/cups/templates/pl/class-modified.tmpl
+share/cups/templates/pl/classes.tmpl
+share/cups/templates/pl/classes-header.tmpl
+share/cups/templates/pl/edit-config.tmpl
+share/cups/templates/pl/error.tmpl
+share/cups/templates/pl/error-op.tmpl
+share/cups/templates/pl/header.tmpl
+share/cups/templates/pl/help-header.tmpl
+share/cups/templates/pl/help-printable.tmpl
+share/cups/templates/pl/job-cancel.tmpl
+share/cups/templates/pl/job-hold.tmpl
+share/cups/templates/pl/job-move.tmpl
+share/cups/templates/pl/job-moved.tmpl
+share/cups/templates/pl/job-release.tmpl
+share/cups/templates/pl/job-restart.tmpl
+share/cups/templates/pl/jobs.tmpl
+share/cups/templates/pl/jobs-header.tmpl
+share/cups/templates/pl/maintenance.tmpl
+share/cups/templates/pl/modify-class.tmpl
+share/cups/templates/pl/modify-printer.tmpl
+share/cups/templates/pl/option-boolean.tmpl
+share/cups/templates/pl/option-conflict.tmpl
+share/cups/templates/pl/option-header.tmpl
+share/cups/templates/pl/option-pickmany.tmpl
+share/cups/templates/pl/option-pickone.tmpl
+share/cups/templates/pl/option-trailer.tmpl
+share/cups/templates/pl/pager.tmpl
+share/cups/templates/pl/printer-accept.tmpl
+share/cups/templates/pl/printer-added.tmpl
+share/cups/templates/pl/printer-configured.tmpl
+share/cups/templates/pl/printer-confirm.tmpl
+share/cups/templates/pl/printer-default.tmpl
+share/cups/templates/pl/printer-deleted.tmpl
+share/cups/templates/pl/printer-jobs-header.tmpl
+share/cups/templates/pl/printer-modified.tmpl
+share/cups/templates/pl/printer-purge.tmpl
+share/cups/templates/pl/printer-reject.tmpl
+share/cups/templates/pl/printer-start.tmpl
+share/cups/templates/pl/printer-stop.tmpl
+share/cups/templates/pl/printers.tmpl
+share/cups/templates/pl/printers-header.tmpl
+share/cups/templates/pl/restart.tmpl
+share/cups/templates/pl/search.tmpl
+share/cups/templates/pl/samba-export.tmpl
+share/cups/templates/pl/samba-exported.tmpl
+share/cups/templates/pl/set-printer-options-header.tmpl
+share/cups/templates/pl/set-printer-options-trailer.tmpl
+share/cups/templates/pl/test-page.tmpl
+share/cups/templates/pl/trailer.tmpl
+share/cups/templates/pl/users.tmpl
+share/cups/templates/sv/add-class.tmpl
+share/cups/templates/sv/add-printer.tmpl
+share/cups/templates/sv/admin.tmpl
+share/cups/templates/sv/choose-device.tmpl
+share/cups/templates/sv/choose-make.tmpl
+share/cups/templates/sv/choose-model.tmpl
+share/cups/templates/sv/choose-serial.tmpl
+share/cups/templates/sv/choose-uri.tmpl
+share/cups/templates/sv/class-added.tmpl
+share/cups/templates/sv/class-confirm.tmpl
+share/cups/templates/sv/class-deleted.tmpl
+share/cups/templates/sv/class-jobs-header.tmpl
+share/cups/templates/sv/class-modified.tmpl
+share/cups/templates/sv/classes.tmpl
+share/cups/templates/sv/classes-header.tmpl
+share/cups/templates/sv/edit-config.tmpl
+share/cups/templates/sv/error.tmpl
+share/cups/templates/sv/error-op.tmpl
+share/cups/templates/sv/header.tmpl
+share/cups/templates/sv/help-header.tmpl
+share/cups/templates/sv/help-printable.tmpl
+share/cups/templates/sv/job-cancel.tmpl
+share/cups/templates/sv/job-hold.tmpl
+share/cups/templates/sv/job-move.tmpl
+share/cups/templates/sv/job-moved.tmpl
+share/cups/templates/sv/job-release.tmpl
+share/cups/templates/sv/job-restart.tmpl
+share/cups/templates/sv/jobs.tmpl
+share/cups/templates/sv/jobs-header.tmpl
+share/cups/templates/sv/maintenance.tmpl
+share/cups/templates/sv/modify-class.tmpl
+share/cups/templates/sv/modify-printer.tmpl
+share/cups/templates/sv/option-boolean.tmpl
+share/cups/templates/sv/option-conflict.tmpl
+share/cups/templates/sv/option-header.tmpl
+share/cups/templates/sv/option-pickmany.tmpl
+share/cups/templates/sv/option-pickone.tmpl
+share/cups/templates/sv/option-trailer.tmpl
+share/cups/templates/sv/pager.tmpl
+share/cups/templates/sv/printer-accept.tmpl
+share/cups/templates/sv/printer-added.tmpl
+share/cups/templates/sv/printer-configured.tmpl
+share/cups/templates/sv/printer-confirm.tmpl
+share/cups/templates/sv/printer-default.tmpl
+share/cups/templates/sv/printer-deleted.tmpl
+share/cups/templates/sv/printer-jobs-header.tmpl
+share/cups/templates/sv/printer-modified.tmpl
+share/cups/templates/sv/printer-purge.tmpl
+share/cups/templates/sv/printer-reject.tmpl
+share/cups/templates/sv/printer-start.tmpl
+share/cups/templates/sv/printer-stop.tmpl
+share/cups/templates/sv/printers.tmpl
+share/cups/templates/sv/printers-header.tmpl
+share/cups/templates/sv/restart.tmpl
+share/cups/templates/sv/search.tmpl
+share/cups/templates/sv/samba-export.tmpl
+share/cups/templates/sv/samba-exported.tmpl
+share/cups/templates/sv/set-printer-options-header.tmpl
+share/cups/templates/sv/set-printer-options-trailer.tmpl
+share/cups/templates/sv/test-page.tmpl
+share/cups/templates/sv/trailer.tmpl
+share/cups/templates/sv/users.tmpl
+etc/cups/cupsd.conf.default
+libexec/cups/backend/ipp
+libexec/cups/backend/lpd
+libexec/cups/backend/http
+libexec/cups/backend/parallel
+libexec/cups/backend/scsi
+libexec/cups/backend/serial
+libexec/cups/backend/snmp
+libexec/cups/backend/socket
+libexec/cups/backend/usb
+libexec/cups/cgi-bin/admin.cgi
+libexec/cups/cgi-bin/classes.cgi
+libexec/cups/cgi-bin/help.cgi
+libexec/cups/cgi-bin/jobs.cgi
+libexec/cups/cgi-bin/printers.cgi
+libexec/cups/monitor/bcp
+libexec/cups/monitor/tbcp
+libexec/cups/filter/gziptoany
+libexec/cups/filter/hpgltops
+libexec/cups/filter/texttops
+libexec/cups/filter/pstops
+libexec/cups/filter/imagetops
+libexec/cups/filter/imagetoraster
+libexec/cups/filter/rastertodymo
+libexec/cups/filter/rastertolabel
+libexec/cups/filter/rastertoepson
+libexec/cups/filter/rastertohp
+libexec/cups/filter/pdftops
+libexec/cups/notifier/mailto
+libexec/cups/notifier/testnotify
+libexec/cups/daemon/cups-deviced
+libexec/cups/daemon/cups-driverd
+libexec/cups/daemon/cups-lpd
+libexec/cups/daemon/cups-polld
+sbin/cupsd
+sbin/lpc
+sbin/accept
+sbin/cupsaddsmb
+sbin/lpadmin
+sbin/lpinfo
+sbin/lpmove
+@dirrmtry share/nls
 @dirrmtry share/locale/sv
-@dirrmtry share/locale/ru_RU
-@dirrmtry share/locale/it
-@dirrmtry share/locale/he
-@dirrmtry share/locale/fr
+@dirrmtry share/locale/ja
 @dirrmtry share/locale/es
-@dirrmtry share/locale/en
-@dirrmtry share/locale/en_US
-@dirrmtry share/locale/de
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/be
-@dirrmtry share/locale/C
-@dirrmtry share/locale
+@dirrm share/doc/cups/sv/images
+@dirrm share/doc/cups/sv
+@dirrm share/doc/cups/pl/images
+@dirrm share/doc/cups/pl
+@dirrm share/doc/cups/ja/images
+@dirrm share/doc/cups/ja
 @dirrm share/doc/cups/images
-@dirrm share/doc/cups/be/images
-@dirrm share/doc/cups/be
+@dirrm share/doc/cups/help
 @dirrm share/doc/cups/es/images
 @dirrm share/doc/cups/es
-@dirrm share/doc/cups/fr/images
-@dirrm share/doc/cups/fr
-@dirrm share/doc/cups/de/images
-@dirrm share/doc/cups/de
 @dirrm share/doc/cups
-@dirrm share/cups/templates/be
+@dirrmtry share/doc
+@dirrm share/cups/templates/sv
+@dirrm share/cups/templates/pl
+@dirrm share/cups/templates/ja
 @dirrm share/cups/templates/es
-@dirrm share/cups/templates/fr
-@dirrm share/cups/templates/de
 @dirrm share/cups/templates
+@dirrm share/cups/profiles
 @dirrm share/cups/model
 @dirrm share/cups/fonts
 @dirrm share/cups/data
 @dirrm share/cups/charsets
+@dirrm share/cups/charmaps
 @dirrm share/cups/banners
 @dirrm share/cups
+@dirrm libexec/cups/notifier
+@dirrm libexec/cups/monitor
 @dirrm libexec/cups/filter
+@dirrm libexec/cups/driver
 @dirrm libexec/cups/daemon
 @dirrm libexec/cups/cgi-bin
 @dirrm libexec/cups/backend
 @dirrm libexec/cups
 @dirrm include/cups
-@dirrm etc/cups/ppd
-@dirrm etc/cups/interfaces
-@dirrm etc/cups/certs
-@exec mkdir -p /var/spool/cups/tmp || true
-@exec chown -R root:daemon /var/spool/cups
-@exec mkdir %D/etc/cups/certs || true
-@exec mkdir %D/etc/cups/ppd || true
-@exec mkdir %D/etc/cups/interfaces || true
-@unexec rm -rf /var/spool/cups
+@dirrmtry etc/cups/ppd
+@dirrmtry etc/cups/interfaces
 @dirrmtry etc/cups