cups: update to 1.2.0

1 files changed, 248 insertions, 74 deletions

diff --git a/cups/.footprint b/cups/.footprint
index fde420986..cdb3eb980 100644
--- a/cups/.footprint
+++ b/cups/.footprint
@@ -1,59 +1,71 @@
 drwxr-xr-x	root/root	etc/
-drwxr-xr-x	root/root	etc/cups/
-drwx--x--x	root/root	etc/cups/certs/
--rw-r--r--	root/root	etc/cups/classes.conf
--rw-r--r--	root/root	etc/cups/client.conf
--rw-r--r--	root/root	etc/cups/cupsd.conf
-drwxr-xr-x	root/root	etc/cups/interfaces/
+drwxr-xr-x	root/lp	etc/cups/
+-rw-r-----	root/lp	etc/cups/cupsd.conf
+-rw-r-----	root/lp	etc/cups/cupsd.conf.default
+drwxr-xr-x	root/lp	etc/cups/interfaces/
 -rw-r--r--	root/root	etc/cups/mime.convs
 -rw-r--r--	root/root	etc/cups/mime.types
-drwxr-xr-x	root/root	etc/cups/ppd/
--rw-r--r--	root/root	etc/cups/printers.conf
+drwxr-xr-x	root/lp	etc/cups/ppd/
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/cups
+drwxr-xr-x	root/root	etc/ssl/
+drwxr-xr-x	root/root	etc/ssl/certs/
+-rw-------	root/root	etc/ssl/certs/cups.crt (EMPTY)
+drwxr-xr-x	root/root	etc/ssl/keys/
+-rw-------	root/root	etc/ssl/keys/cups.key (EMPTY)
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cancel
 -rwxr-xr-x	root/root	usr/bin/cups-config
+-rwxr-xr-x	root/root	usr/bin/cupstestdsc
 -rwxr-xr-x	root/root	usr/bin/cupstestppd
-lrwxrwxrwx	root/root	usr/bin/disable -> ../sbin/accept
-lrwxrwxrwx	root/root	usr/bin/enable -> ../sbin/accept
 -rwxr-xr-x	root/root	usr/bin/lp
 -rwxr-xr-x	root/root	usr/bin/lpoptions
--rwsr-xr-x	daemon/daemon	usr/bin/lppasswd
+-rwsr-xr-x	daemon/lp	usr/bin/lppasswd
 -rwxr-xr-x	root/root	usr/bin/lpq
 -rwxr-xr-x	root/root	usr/bin/lpr
 -rwxr-xr-x	root/root	usr/bin/lprm
 -rwxr-xr-x	root/root	usr/bin/lpstat
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/cups/
+-rw-r--r--	root/root	usr/include/cups/adminutil.h
+-rw-r--r--	root/root	usr/include/cups/array.h
 -rw-r--r--	root/root	usr/include/cups/cups.h
+-rw-r--r--	root/root	usr/include/cups/dir.h
+-rw-r--r--	root/root	usr/include/cups/file.h
 -rw-r--r--	root/root	usr/include/cups/http.h
+-rw-r--r--	root/root	usr/include/cups/i18n.h
 -rw-r--r--	root/root	usr/include/cups/image.h
 -rw-r--r--	root/root	usr/include/cups/ipp.h
 -rw-r--r--	root/root	usr/include/cups/language.h
 -rw-r--r--	root/root	usr/include/cups/md5.h
 -rw-r--r--	root/root	usr/include/cups/ppd.h
 -rw-r--r--	root/root	usr/include/cups/raster.h
+-rw-r--r--	root/root	usr/include/cups/transcode.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/cups/
 drwxr-xr-x	root/root	usr/lib/cups/backend/
 lrwxrwxrwx	root/root	usr/lib/cups/backend/http -> ipp
--rwxr-xr-x	root/root	usr/lib/cups/backend/ipp
--rwxr-xr-x	root/root	usr/lib/cups/backend/lpd
+-rwx------	root/root	usr/lib/cups/backend/ipp
+-rwx------	root/root	usr/lib/cups/backend/lpd
 -rwxr-xr-x	root/root	usr/lib/cups/backend/parallel
 -rwxr-xr-x	root/root	usr/lib/cups/backend/scsi
 -rwxr-xr-x	root/root	usr/lib/cups/backend/serial
+-rwxr-xr-x	root/root	usr/lib/cups/backend/snmp
 -rwxr-xr-x	root/root	usr/lib/cups/backend/socket
 -rwxr-xr-x	root/root	usr/lib/cups/backend/usb
 drwxr-xr-x	root/root	usr/lib/cups/cgi-bin/
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/admin.cgi
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/classes.cgi
+-rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/help.cgi
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/jobs.cgi
 -rwxr-xr-x	root/root	usr/lib/cups/cgi-bin/printers.cgi
 drwxr-xr-x	root/root	usr/lib/cups/daemon/
+-rwxr-xr-x	root/root	usr/lib/cups/daemon/cups-deviced
+-rwxr-xr-x	root/root	usr/lib/cups/daemon/cups-driverd
 -rwxr-xr-x	root/root	usr/lib/cups/daemon/cups-lpd
 -rwxr-xr-x	root/root	usr/lib/cups/daemon/cups-polld
+drwxr-xr-x	root/root	usr/lib/cups/driver/
 drwxr-xr-x	root/root	usr/lib/cups/filter/
 -rwxr-xr-x	root/root	usr/lib/cups/filter/gziptoany
 -rwxr-xr-x	root/root	usr/lib/cups/filter/hpgltops
@@ -61,23 +73,27 @@ drwxr-xr-x	root/root	usr/lib/cups/filter/
 -rwxr-xr-x	root/root	usr/lib/cups/filter/imagetoraster
 -rwxr-xr-x	root/root	usr/lib/cups/filter/pdftops
 -rwxr-xr-x	root/root	usr/lib/cups/filter/pstops
--rwxr-xr-x	root/root	usr/lib/cups/filter/rastertodymo
+lrwxrwxrwx	root/root	usr/lib/cups/filter/rastertodymo -> rastertolabel
 -rwxr-xr-x	root/root	usr/lib/cups/filter/rastertoepson
 -rwxr-xr-x	root/root	usr/lib/cups/filter/rastertohp
+-rwxr-xr-x	root/root	usr/lib/cups/filter/rastertolabel
 -rwxr-xr-x	root/root	usr/lib/cups/filter/texttops
--rwxr-xr-x	root/root	usr/lib/libcups.a
+drwxr-xr-x	root/root	usr/lib/cups/monitor/
+-rwxr-xr-x	root/root	usr/lib/cups/monitor/bcp
+-rwxr-xr-x	root/root	usr/lib/cups/monitor/tbcp
+drwxr-xr-x	root/root	usr/lib/cups/notifier/
+-rwxr-xr-x	root/root	usr/lib/cups/notifier/mailto
+-rwxr-xr-x	root/root	usr/lib/cups/notifier/testnotify
 lrwxrwxrwx	root/root	usr/lib/libcups.so -> libcups.so.2
 -rwxr-xr-x	root/root	usr/lib/libcups.so.2
--rwxr-xr-x	root/root	usr/lib/libcupsimage.a
 lrwxrwxrwx	root/root	usr/lib/libcupsimage.so -> libcupsimage.so.2
 -rwxr-xr-x	root/root	usr/lib/libcupsimage.so.2
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/backend.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/cancel.1.gz -> lp.1.gz
+-rw-r--r--	root/root	usr/man/man1/cancel.1.gz
 -rw-r--r--	root/root	usr/man/man1/cups-config.1.gz
+-rw-r--r--	root/root	usr/man/man1/cupstestdsc.1.gz
 -rw-r--r--	root/root	usr/man/man1/cupstestppd.1.gz
--rw-r--r--	root/root	usr/man/man1/filter.1.gz
 -rw-r--r--	root/root	usr/man/man1/lp.1.gz
 -rw-r--r--	root/root	usr/man/man1/lpoptions.1.gz
 -rw-r--r--	root/root	usr/man/man1/lppasswd.1.gz
@@ -87,18 +103,26 @@ lrwxrwxrwx	root/root	usr/man/man1/cancel.1.gz -> lp.1.gz
 -rw-r--r--	root/root	usr/man/man1/lpstat.1.gz
 drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/classes.conf.5.gz
+-rw-r--r--	root/root	usr/man/man5/client.conf.5.gz
+-rw-r--r--	root/root	usr/man/man5/cups-snmp.conf.5.gz
 -rw-r--r--	root/root	usr/man/man5/cupsd.conf.5.gz
 -rw-r--r--	root/root	usr/man/man5/mime.convs.5.gz
 -rw-r--r--	root/root	usr/man/man5/mime.types.5.gz
 -rw-r--r--	root/root	usr/man/man5/printers.conf.5.gz
+-rw-r--r--	root/root	usr/man/man5/subscriptions.conf.5.gz
+drwxr-xr-x	root/root	usr/man/man7/
+-rw-r--r--	root/root	usr/man/man7/backend.7.gz
+-rw-r--r--	root/root	usr/man/man7/filter.7.gz
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/accept.8.gz
+-rw-r--r--	root/root	usr/man/man8/cups-deviced.8.gz
+-rw-r--r--	root/root	usr/man/man8/cups-driverd.8.gz
 -rw-r--r--	root/root	usr/man/man8/cups-lpd.8.gz
 -rw-r--r--	root/root	usr/man/man8/cups-polld.8.gz
 -rw-r--r--	root/root	usr/man/man8/cupsaddsmb.8.gz
 -rw-r--r--	root/root	usr/man/man8/cupsd.8.gz
-lrwxrwxrwx	root/root	usr/man/man8/disable.8.gz -> enable.8.gz
--rw-r--r--	root/root	usr/man/man8/enable.8.gz
+lrwxrwxrwx	root/root	usr/man/man8/cupsdisable.8.gz -> cupsenable.8.gz
+-rw-r--r--	root/root	usr/man/man8/cupsenable.8.gz
 -rw-r--r--	root/root	usr/man/man8/lpadmin.8.gz
 -rw-r--r--	root/root	usr/man/man8/lpc.8.gz
 -rw-r--r--	root/root	usr/man/man8/lpinfo.8.gz
@@ -108,6 +132,8 @@ drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/accept
 -rwxr-xr-x	root/root	usr/sbin/cupsaddsmb
 -rwxr-xr-x	root/root	usr/sbin/cupsd
+lrwxrwxrwx	root/root	usr/sbin/cupsdisable -> accept
+lrwxrwxrwx	root/root	usr/sbin/cupsenable -> accept
 -rwxr-xr-x	root/root	usr/sbin/lpadmin
 -rwxr-xr-x	root/root	usr/sbin/lpc
 -rwxr-xr-x	root/root	usr/sbin/lpinfo
@@ -122,6 +148,44 @@ drwxr-xr-x	root/root	usr/share/cups/banners/
 -rw-r--r--	root/root	usr/share/cups/banners/standard
 -rw-r--r--	root/root	usr/share/cups/banners/topsecret
 -rw-r--r--	root/root	usr/share/cups/banners/unclassified
+drwxr-xr-x	root/root	usr/share/cups/charmaps/
+-rw-r--r--	root/root	usr/share/cups/charmaps/euc-cn.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/euc-jp.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/euc-kr.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/euc-tw.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-1.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-10.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-11.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-13.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-14.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-15.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-16.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-2.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-3.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-4.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-5.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-6.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-7.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-8.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/iso-8859-9.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/koi8-r.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/koi8-u.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/mac-roman.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1250.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1251.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1252.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1253.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1254.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1255.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1256.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1257.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1258.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-1361.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-874.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-932.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-936.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-949.txt
+-rw-r--r--	root/root	usr/share/cups/charmaps/windows-950.txt
 drwxr-xr-x	root/root	usr/share/cups/charsets/
 -rw-r--r--	root/root	usr/share/cups/charsets/iso-8859-1
 -rw-r--r--	root/root	usr/share/cups/charsets/iso-8859-10
@@ -154,62 +218,149 @@ drwxr-xr-x	root/root	usr/share/cups/data/
 -rw-r--r--	root/root	usr/share/cups/data/psglyphs
 -rw-r--r--	root/root	usr/share/cups/data/testprint.ps
 drwxr-xr-x	root/root	usr/share/cups/doc/
--rw-r--r--	root/root	usr/share/cups/doc/cmp.html
+-rw-r--r--	root/root	usr/share/cups/doc/cups-printable.css
 -rw-r--r--	root/root	usr/share/cups/doc/cups.css
--rw-r--r--	root/root	usr/share/cups/doc/cupsdoc.css
--rw-r--r--	root/root	usr/share/cups/doc/documentation.html
--rw-r--r--	root/root	usr/share/cups/doc/idd.html
+-rw-r--r--	root/root	usr/share/cups/doc/favicon.ico
+drwxr-xr-x	root/root	usr/share/cups/doc/help/
+-rw-r--r--	root/root	usr/share/cups/doc/help/api-array.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/api-cups.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/api-filedir.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/api-filter.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/api-httpipp.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/api-ppd.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/api-raster.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/cgi.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/glossary.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/license.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-accept.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-backend.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cancel.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-classes.conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-client.conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cups-config.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cups-lpd.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cups-polld.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsaddsmb.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsd.conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsd.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cupsenable.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cupstestdsc.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-cupstestppd.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-filter.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lp.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpadmin.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpc.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpinfo.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpmove.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpoptions.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lppasswd.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpq.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpr.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lprm.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-lpstat.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-mime.convs.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-mime.types.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/man-printers.conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/network.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/options.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/overview.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-access_log.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-classes-conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-client-conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-cupsd-conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-error_log.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-page_log.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-printers-conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-snmp-conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/ref-subscriptions-conf.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/security.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/spec-cmp.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/spec-command.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/spec-design.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/spec-ipp.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/spec-ppd.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/spec-raster.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/spec-stp.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/standard.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/translation.html
+-rw-r--r--	root/root	usr/share/cups/doc/help/whatsnew.html
 drwxr-xr-x	root/root	usr/share/cups/doc/images/
--rw-r--r--	root/root	usr/share/cups/doc/images/accept-jobs.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/add-class.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/add-printer.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/cancel-job.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/bottom-left.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/bottom-right.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-accept-jobs.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-add-class.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-add-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-add-this-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-cancel-all-jobs.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-cancel-job.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-change-settings.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-clean-print-heads.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-clear.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-continue.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-delete-class.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-delete-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-edit-configuration-file.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-export-samba.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-help.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-hold-job.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-manage-classes.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-manage-jobs.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-manage-printers.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-manage-server.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-modify-class.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-modify-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-move-job.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-move-jobs.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-print-self-test-page.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-print-test-page.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-publish-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-reject-jobs.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-release-job.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-restart-job.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-save-changes.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-search.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-set-allowed-users.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-set-as-default.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-set-printer-options.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-show-active.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-show-all.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-show-completed.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-show-next.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-show-previous.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-sort-ascending.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-sort-descending.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-start-class.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-start-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-stop-class.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-stop-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-unpublish-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-use-default-config.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-view-access-log.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-view-error-log.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-view-page-log.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/button-view-printable-version.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/classes.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/config-printer.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/continue.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/cups-block-diagram.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/cups-large.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/cups-medium.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/cups-small.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/delete-class.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/delete-printer.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/hold-job.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/left.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/esp-logo.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/happy.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/logo.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/manage-classes.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/manage-jobs.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/manage-printers.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/modify-class.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/modify-printer.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/navbar.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/print-test-page.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/printer-idle.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/printer-processing.gif
 -rw-r--r--	root/root	usr/share/cups/doc/images/printer-stopped.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/reject-jobs.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/release-job.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/restart-job.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/right.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/set-as-default.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/show-active.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/show-completed.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/start-class.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/start-printer.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/stop-class.gif
--rw-r--r--	root/root	usr/share/cups/doc/images/stop-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/smiley.jpg
+-rw-r--r--	root/root	usr/share/cups/doc/images/tab-left.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/tab-right.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/top-left.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/top-middle.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/top-right.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/web-add-this-printer.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/web-password.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/web-printer-driver.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/web-printer-status.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/web-set-printer-options.gif
+-rw-r--r--	root/root	usr/share/cups/doc/images/web-test-page.gif
 -rw-r--r--	root/root	usr/share/cups/doc/index.html
--rw-r--r--	root/root	usr/share/cups/doc/ipp.html
--rw-r--r--	root/root	usr/share/cups/doc/overview.html
 -rw-r--r--	root/root	usr/share/cups/doc/robots.txt
--rw-r--r--	root/root	usr/share/cups/doc/sam.html
--rw-r--r--	root/root	usr/share/cups/doc/sdd.html
--rw-r--r--	root/root	usr/share/cups/doc/spm.html
--rw-r--r--	root/root	usr/share/cups/doc/sps.html
--rw-r--r--	root/root	usr/share/cups/doc/ssr.html
--rw-r--r--	root/root	usr/share/cups/doc/stp.html
--rw-r--r--	root/root	usr/share/cups/doc/sum.html
--rw-r--r--	root/root	usr/share/cups/doc/svd.html
--rw-r--r--	root/root	usr/share/cups/doc/translation.html
 drwxr-xr-x	root/root	usr/share/cups/fonts/
 -rw-r--r--	root/root	usr/share/cups/fonts/Courier
 -rw-r--r--	root/root	usr/share/cups/fonts/Courier-Bold
@@ -230,32 +381,40 @@ drwxr-xr-x	root/root	usr/share/cups/model/
 -rw-r--r--	root/root	usr/share/cups/model/stphoto.ppd
 -rw-r--r--	root/root	usr/share/cups/model/stphoto2.ppd
 -rw-r--r--	root/root	usr/share/cups/model/zebra.ppd
+-rw-r--r--	root/root	usr/share/cups/model/zebraep1.ppd
+-rw-r--r--	root/root	usr/share/cups/model/zebraep2.ppd
+drwxr-xr-x	root/root	usr/share/cups/profiles/
 drwxr-xr-x	root/root	usr/share/cups/templates/
 -rw-r--r--	root/root	usr/share/cups/templates/add-class.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/add-printer.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/admin-op.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/admin.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/choose-device.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/choose-make.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/choose-members.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/choose-model.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/choose-serial.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/choose-uri.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/class-added.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/class-confirm.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/class-deleted.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/class-jobs-header.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/class-modified.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/classes-header.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/classes.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/config-printer.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/config-printer2.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/edit-config.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/error-op.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/error.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/header.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/help-header.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/help-printable.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/job-cancel.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/job-hold.tmpl
--rw-r--r--	root/root	usr/share/cups/templates/job-op.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/job-move.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/job-moved.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/job-release.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/job-restart.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/jobs-header.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/jobs.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/maintenance.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/modify-class.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/modify-printer.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/option-boolean.tmpl
@@ -264,23 +423,38 @@ drwxr-xr-x	root/root	usr/share/cups/templates/
 -rw-r--r--	root/root	usr/share/cups/templates/option-pickmany.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/option-pickone.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/option-trailer.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/pager.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-accept.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-added.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-configured.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-confirm.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-default.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-deleted.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/printer-jobs-header.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-modified.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-purge.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-reject.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-start.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printer-stop.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/printers-header.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/printers.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/restart.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/samba-export.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/samba-exported.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/search.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/set-printer-options-header.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/set-printer-options-trailer.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/test-page.tmpl
 -rw-r--r--	root/root	usr/share/cups/templates/trailer.tmpl
+-rw-r--r--	root/root	usr/share/cups/templates/users.tmpl
 drwxr-xr-x	root/root	var/
+drwxrwxr-x	root/root	var/cache/
+drwxrwxr-x	root/lp	var/cache/cups/
 drwxr-xr-x	root/root	var/log/
 drwxr-xr-x	root/root	var/log/cups/
+drwxr-xr-x	root/root	var/run/
+drwxr-xr-x	root/root	var/run/cups/
+dr-x--x--x	root/sys	var/run/cups/certs/
 drwxr-xr-x	root/root	var/spool/
-drwx--x---	root/root	var/spool/cups/
-drwxrwx--T	root/root	var/spool/cups/tmp/
+drwx--x---	root/lp	var/spool/cups/
+drwxrwx--T	root/lp	var/spool/cups/tmp/