From owner-svn-ports-branches@FreeBSD.ORG Tue Jun 9 23:23:31 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBEDFF97; Tue, 9 Jun 2015 23:23:31 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D83CE1668; Tue, 9 Jun 2015 23:23:31 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t59NNV05090574; Tue, 9 Jun 2015 23:23:31 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t59NNTQ6090558; Tue, 9 Jun 2015 23:23:29 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506092323.t59NNTQ6090558@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 9 Jun 2015 23:23:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389009 - in branches/2015Q2/print/cups-base: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2015 23:23:32 -0000 Author: delphij Date: Tue Jun 9 23:23:28 2015 New Revision: 389009 URL: https://svnweb.freebsd.org/changeset/ports/389009 Log: MFH: r389006 Security update to 2.0.3. Approved by: ports-secteam Added: branches/2015Q2/print/cups-base/files/patch-data_cups.pam - copied unchanged from r389006, head/print/cups-base/files/patch-data_cups.pam branches/2015Q2/print/cups-base/files/patch-scheduler_Makefile - copied unchanged from r389006, head/print/cups-base/files/patch-scheduler_Makefile Deleted: branches/2015Q2/print/cups-base/files/patch-cups-cups.h branches/2015Q2/print/cups-base/files/patch-cups.pam branches/2015Q2/print/cups-base/files/patch-scheduler__dirsvc.c Modified: branches/2015Q2/print/cups-base/Makefile branches/2015Q2/print/cups-base/distinfo branches/2015Q2/print/cups-base/files/patch-conf-Makefile branches/2015Q2/print/cups-base/files/patch-configure branches/2015Q2/print/cups-base/files/patch-data-Makefile branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c branches/2015Q2/print/cups-base/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/print/cups-base/Makefile ============================================================================== --- branches/2015Q2/print/cups-base/Makefile Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/Makefile Tue Jun 9 23:23:28 2015 (r389009) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 1.7.3 +PORTVERSION= 2.0.3 DISTVERSIONSUFFIX= -source #PORTREVISION= defined further CATEGORIES= print @@ -55,18 +55,18 @@ OPTIONS_SINGLE_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL OPTIONS_SUB= yes .if defined(CUPS_CLIENT) -PORTREVISION= 4 +PORTREVISION= 0 LICENSE= LGPL21 CUPS_SUFFIX= -client OPTIONS_RADIO= ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER OPTIONS_DEFAULT+= MDNSRESPONDER .elif defined(CUPS_IMAGE) -PORTREVISION= 3 +PORTREVISION= 0 CUPS_SUFFIX= -image LICENSE= LGPL21 .else -PORTREVISION= 4 +PORTREVISION= 0 CUPS_SUFFIX= -base # No DOCS option. Files are needed by web interface. OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN @@ -187,8 +187,10 @@ RUN_DEPENDS+= xdg-open:${PORTSDIR}/deve . if ${PORT_OPTIONS:MLIBUSB} CONFIGURE_ARGS+= --enable-libusb +PLIST_SUB+= LIBUSB="" . else CONFIGURE_ARGS+= --disable-libusb +PLIST_SUB+= LIBUSB="@comment " . endif . if ${PORT_OPTIONS:MICONS} Modified: branches/2015Q2/print/cups-base/distinfo ============================================================================== --- branches/2015Q2/print/cups-base/distinfo Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/distinfo Tue Jun 9 23:23:28 2015 (r389009) @@ -1,2 +1,2 @@ -SHA256 (cups-1.7.3-source.tar.bz2) = fa989f856d1499169dc442fb2311053ea42fe455ca2721693ba5a9fe4b333e31 -SIZE (cups-1.7.3-source.tar.bz2) = 8792641 +SHA256 (cups-2.0.3-source.tar.bz2) = bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881 +SIZE (cups-2.0.3-source.tar.bz2) = 8797220 Modified: branches/2015Q2/print/cups-base/files/patch-conf-Makefile ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-conf-Makefile Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-conf-Makefile Tue Jun 9 23:23:28 2015 (r389009) @@ -1,16 +1,34 @@ ---- conf/Makefile.orig 2011-03-03 00:19:41.555484014 +0100 -+++ conf/Makefile 2011-03-03 00:20:17.791387420 +0100 -@@ -90,10 +90,10 @@ +--- conf/Makefile.orig 2013-05-29 11:51:34 UTC ++++ conf/Makefile +@@ -77,7 +77,7 @@ install-data: + $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ + fi ; \ + done +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default ++ $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.sample + $(INSTALL_DIR) -m 755 $(DATADIR)/mime + for file in $(REPLACE); do \ + if test -r $(DATADIR)/mime/$$file ; then \ +@@ -90,10 +90,10 @@ install-data: done -if test x$(PAMDIR) != x; then \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ - if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ - $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ if test -r $(BUILDROOT)$(PAMDIR)/cups.default ; then \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.default.N ; \ ++ if test -r $(BUILDROOT)$(PAMDIR)/cups.sample ; then \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.sample.N ; \ else \ - $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.default ; \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.sample ; \ fi ; \ fi +@@ -124,7 +124,7 @@ install-libs: + # + + uninstall: +- for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \ ++ for file in $(KEEP) $(REPLACE) cupsd.conf.sample; do \ + $(RM) $(SERVERROOT)/$$file; \ + done + -$(RMDIR) $(SERVERROOT) Modified: branches/2015Q2/print/cups-base/files/patch-configure ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-configure Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-configure Tue Jun 9 23:23:28 2015 (r389009) @@ -1,6 +1,6 @@ ---- ./configure.orig 2014-05-27 14:33:29.000000000 -0400 -+++ ./configure 2014-07-01 13:49:23.000000000 -0400 -@@ -566,6 +566,7 @@ +--- configure.orig 2015-02-09 19:38:35 UTC ++++ configure +@@ -586,6 +586,7 @@ ac_unique_file="cups/cups.h" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -8,16 +8,7 @@ #ifdef HAVE_SYS_TYPES_H # include #endif -@@ -5238,7 +5239,7 @@ - - - if test "x$PKGCONFIG" != x; then -- if test x$enable_libusb = xyes -o $uname != Darwin; then -+ if test x$enable_libusb = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0" >&5 - $as_echo_n "checking for libusb-1.0... " >&6; } - if $PKGCONFIG --exists libusb-1.0; then -@@ -5249,6 +5250,13 @@ +@@ -5382,6 +5383,13 @@ $as_echo "yes" >&6; } CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`" LIBUSB="`$PKGCONFIG --libs libusb-1.0`" USBQUIRKS="\$(DATADIR)/usb" @@ -31,7 +22,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -5527,7 +5535,7 @@ +@@ -5663,7 +5671,7 @@ $as_echo "yes" >&6; } CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`" DBUS_NOTIFIER="dbus" @@ -40,3 +31,21 @@ SAVELIBS="$LIBS" LIBS="$LIBS $DBUS_NOTIFIERLIBS" ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append" +@@ -8646,7 +8654,7 @@ fi + fi + + # Find the PAM configuration directory, if any... +- for dir in /private/etc/pam.d /etc/pam.d; do ++ for dir in /usr/local/etc/pam.d /etc/pam.d; do + if test -d $dir; then + PAMDIR=$dir + break; +@@ -8899,7 +8907,7 @@ fi + + LARGEFILE="" + if test x$enable_largefile != xno; then +- LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" ++ LARGEFILE="-D_LARGEFILE_SOURCE " + + if test x$ac_cv_sys_large_files = x1; then + LARGEFILE="$LARGEFILE -D_LARGE_FILES" Modified: branches/2015Q2/print/cups-base/files/patch-data-Makefile ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-data-Makefile Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-data-Makefile Tue Jun 9 23:23:28 2015 (r389009) @@ -1,6 +1,6 @@ ---- data/Makefile.orig 2013-05-29 15:51:34.000000000 +0400 -+++ data/Makefile 2013-12-11 17:17:05.670284926 +0400 -@@ -86,14 +86,14 @@ +--- data/Makefile.orig 2013-05-29 11:51:34 UTC ++++ data/Makefile +@@ -86,14 +86,14 @@ install: all install-data install-header # install-data: Copied: branches/2015Q2/print/cups-base/files/patch-data_cups.pam (from r389006, head/print/cups-base/files/patch-data_cups.pam) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/print/cups-base/files/patch-data_cups.pam Tue Jun 9 23:23:28 2015 (r389009, copy of r389006, head/print/cups-base/files/patch-data_cups.pam) @@ -0,0 +1,7 @@ +--- data/cups.pam.orig 2006-06-23 00:14:22 UTC ++++ data/cups.pam +@@ -1,2 +1,2 @@ +-auth required /lib/security/pam_pwdb.so nullok shadow +-account required /lib/security/pam_pwdb.so ++auth include system ++account include system Copied: branches/2015Q2/print/cups-base/files/patch-scheduler_Makefile (from r389006, head/print/cups-base/files/patch-scheduler_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/print/cups-base/files/patch-scheduler_Makefile Tue Jun 9 23:23:28 2015 (r389009, copy of r389006, head/print/cups-base/files/patch-scheduler_Makefile) @@ -0,0 +1,20 @@ +--- scheduler/Makefile.orig 2014-10-21 11:55:01 UTC ++++ scheduler/Makefile +@@ -172,7 +172,7 @@ install-data: + $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp + echo Creating $(CACHEDIR)... + $(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR) +- if test "x$(INITDIR)" != x; then \ ++ if test "x$(xxINITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ + $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ +@@ -184,7 +184,7 @@ install-data: + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ + $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi +- if test "x$(INITDDIR)" != x; then \ ++ if test "x$(xxINITDDIR)" != x; then \ + echo Installing init script...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR); \ + $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR); \ Modified: branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c Tue Jun 9 23:23:28 2015 (r389009) @@ -1,20 +1,20 @@ ---- scheduler/auth.c.orig +--- scheduler/auth.c.orig 2014-08-28 15:37:22 UTC +++ scheduler/auth.c -@@ -556,7 +556,7 @@ +@@ -491,7 +491,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I peersize = sizeof(peercred); -# ifdef __APPLE__ +# if defined(__APPLE__) || defined(__FreeBSD__) - if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize)) + if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize)) # else - if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &peercred, &peersize)) -@@ -1155,7 +1155,7 @@ + if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred, &peersize)) +@@ -953,7 +953,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I peersize = sizeof(peercred); -# ifdef __APPLE__ +# if defined(__APPLE__) || defined(__FreeBSD__) - if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize)) + if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize)) # else - if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &peercred, + if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred, Modified: branches/2015Q2/print/cups-base/pkg-plist ============================================================================== --- branches/2015Q2/print/cups-base/pkg-plist Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/pkg-plist Tue Jun 9 23:23:28 2015 (r389009) @@ -21,7 +21,6 @@ bin/cupstestppd bin/ipptool bin/lp bin/lpoptions -bin/lppasswd bin/lpq bin/lpr bin/lpr-cups @@ -43,9 +42,7 @@ lib/libcupsmime.so.1 lib/libcupsppdc.so lib/libcupsppdc.so.1 libexec/cups/backend/http -libexec/cups/backend/https libexec/cups/backend/ipp -libexec/cups/backend/ipps libexec/cups/backend/lpd libexec/cups/backend/snmp libexec/cups/backend/socket @@ -70,11 +67,10 @@ libexec/cups/notifier/rss man/man1/cancel.1.gz man/man1/cupstestdsc.1.gz man/man1/cupstestppd.1.gz -@comment man/man1/ippfind.1.gz +man/man1/cups.1.gz man/man1/ipptool.1.gz man/man1/lp.1.gz man/man1/lpoptions.1.gz -man/man1/lppasswd.1.gz man/man1/lpq.1.gz man/man1/lpr.1.gz man/man1/lprm.1.gz @@ -100,7 +96,10 @@ man/man7/backend.7.gz man/man7/filter.7.gz man/man7/notifier.7.gz man/man8/accept.8.gz +man/man8/cupsd-logs.8.gz +man/man8/cupsd-helper.8.gz man/man8/cups-deviced.8.gz +man/man8/cups-exec.8.gz man/man8/cups-driverd.8.gz man/man8/cups-lpd.8.gz man/man8/cups-snmp.8.gz @@ -186,76 +185,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/add-printer.tmpl %%DATADIR%%/templates/add-rss-subscription.tmpl %%DATADIR%%/templates/admin.tmpl -%%DATADIR%%/templates/ca/add-class.tmpl -%%DATADIR%%/templates/ca/add-printer.tmpl -%%DATADIR%%/templates/ca/add-rss-subscription.tmpl -%%DATADIR%%/templates/ca/admin.tmpl -%%DATADIR%%/templates/ca/choose-device.tmpl -%%DATADIR%%/templates/ca/choose-make.tmpl -%%DATADIR%%/templates/ca/choose-model.tmpl -%%DATADIR%%/templates/ca/choose-serial.tmpl -%%DATADIR%%/templates/ca/choose-uri.tmpl -%%DATADIR%%/templates/ca/class-added.tmpl -%%DATADIR%%/templates/ca/class-confirm.tmpl -%%DATADIR%%/templates/ca/class-deleted.tmpl -%%DATADIR%%/templates/ca/class-jobs-header.tmpl -%%DATADIR%%/templates/ca/class-modified.tmpl -%%DATADIR%%/templates/ca/class.tmpl -%%DATADIR%%/templates/ca/classes-header.tmpl -%%DATADIR%%/templates/ca/classes.tmpl -%%DATADIR%%/templates/ca/command.tmpl -%%DATADIR%%/templates/ca/edit-config.tmpl -%%DATADIR%%/templates/ca/error-op.tmpl -%%DATADIR%%/templates/ca/error.tmpl -%%DATADIR%%/templates/ca/header.tmpl -%%DATADIR%%/templates/ca/help-header.tmpl -%%DATADIR%%/templates/ca/help-printable.tmpl -%%DATADIR%%/templates/ca/help-trailer.tmpl -%%DATADIR%%/templates/ca/job-cancel.tmpl -%%DATADIR%%/templates/ca/job-hold.tmpl -%%DATADIR%%/templates/ca/job-move.tmpl -%%DATADIR%%/templates/ca/job-moved.tmpl -%%DATADIR%%/templates/ca/job-release.tmpl -%%DATADIR%%/templates/ca/job-restart.tmpl -%%DATADIR%%/templates/ca/jobs-header.tmpl -%%DATADIR%%/templates/ca/jobs.tmpl -%%DATADIR%%/templates/ca/list-available-printers.tmpl -%%DATADIR%%/templates/ca/modify-class.tmpl -%%DATADIR%%/templates/ca/modify-printer.tmpl -%%DATADIR%%/templates/ca/norestart.tmpl -%%DATADIR%%/templates/ca/option-boolean.tmpl -%%DATADIR%%/templates/ca/option-conflict.tmpl -%%DATADIR%%/templates/ca/option-header.tmpl -%%DATADIR%%/templates/ca/option-pickmany.tmpl -%%DATADIR%%/templates/ca/option-pickone.tmpl -%%DATADIR%%/templates/ca/option-trailer.tmpl -%%DATADIR%%/templates/ca/pager.tmpl -%%DATADIR%%/templates/ca/printer-accept.tmpl -%%DATADIR%%/templates/ca/printer-added.tmpl -%%DATADIR%%/templates/ca/printer-configured.tmpl -%%DATADIR%%/templates/ca/printer-confirm.tmpl -%%DATADIR%%/templates/ca/printer-default.tmpl -%%DATADIR%%/templates/ca/printer-deleted.tmpl -%%DATADIR%%/templates/ca/printer-jobs-header.tmpl -%%DATADIR%%/templates/ca/printer-modified.tmpl -%%DATADIR%%/templates/ca/printer-purge.tmpl -%%DATADIR%%/templates/ca/printer-reject.tmpl -%%DATADIR%%/templates/ca/printer-start.tmpl -%%DATADIR%%/templates/ca/printer-stop.tmpl -%%DATADIR%%/templates/ca/printer.tmpl -%%DATADIR%%/templates/ca/printers-header.tmpl -%%DATADIR%%/templates/ca/printers.tmpl -%%DATADIR%%/templates/ca/restart.tmpl -%%DATADIR%%/templates/ca/samba-export.tmpl -%%DATADIR%%/templates/ca/samba-exported.tmpl -%%DATADIR%%/templates/ca/search.tmpl -%%DATADIR%%/templates/ca/set-printer-options-header.tmpl -%%DATADIR%%/templates/ca/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/ca/subscription-added.tmpl -%%DATADIR%%/templates/ca/subscription-canceled.tmpl -%%DATADIR%%/templates/ca/test-page.tmpl -%%DATADIR%%/templates/ca/trailer.tmpl -%%DATADIR%%/templates/ca/users.tmpl %%DATADIR%%/templates/choose-device.tmpl %%DATADIR%%/templates/choose-make.tmpl %%DATADIR%%/templates/choose-model.tmpl @@ -270,76 +199,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/classes-header.tmpl %%DATADIR%%/templates/classes.tmpl %%DATADIR%%/templates/command.tmpl -%%DATADIR%%/templates/cs/add-class.tmpl -%%DATADIR%%/templates/cs/add-printer.tmpl -%%DATADIR%%/templates/cs/add-rss-subscription.tmpl -%%DATADIR%%/templates/cs/admin.tmpl -%%DATADIR%%/templates/cs/choose-device.tmpl -%%DATADIR%%/templates/cs/choose-make.tmpl -%%DATADIR%%/templates/cs/choose-model.tmpl -%%DATADIR%%/templates/cs/choose-serial.tmpl -%%DATADIR%%/templates/cs/choose-uri.tmpl -%%DATADIR%%/templates/cs/class-added.tmpl -%%DATADIR%%/templates/cs/class-confirm.tmpl -%%DATADIR%%/templates/cs/class-deleted.tmpl -%%DATADIR%%/templates/cs/class-jobs-header.tmpl -%%DATADIR%%/templates/cs/class-modified.tmpl -%%DATADIR%%/templates/cs/class.tmpl -%%DATADIR%%/templates/cs/classes-header.tmpl -%%DATADIR%%/templates/cs/classes.tmpl -%%DATADIR%%/templates/cs/command.tmpl -%%DATADIR%%/templates/cs/edit-config.tmpl -%%DATADIR%%/templates/cs/error-op.tmpl -%%DATADIR%%/templates/cs/error.tmpl -%%DATADIR%%/templates/cs/header.tmpl -%%DATADIR%%/templates/cs/help-header.tmpl -%%DATADIR%%/templates/cs/help-printable.tmpl -%%DATADIR%%/templates/cs/help-trailer.tmpl -%%DATADIR%%/templates/cs/job-cancel.tmpl -%%DATADIR%%/templates/cs/job-hold.tmpl -%%DATADIR%%/templates/cs/job-move.tmpl -%%DATADIR%%/templates/cs/job-moved.tmpl -%%DATADIR%%/templates/cs/job-release.tmpl -%%DATADIR%%/templates/cs/job-restart.tmpl -%%DATADIR%%/templates/cs/jobs-header.tmpl -%%DATADIR%%/templates/cs/jobs.tmpl -%%DATADIR%%/templates/cs/list-available-printers.tmpl -%%DATADIR%%/templates/cs/modify-class.tmpl -%%DATADIR%%/templates/cs/modify-printer.tmpl -%%DATADIR%%/templates/cs/norestart.tmpl -%%DATADIR%%/templates/cs/option-boolean.tmpl -%%DATADIR%%/templates/cs/option-conflict.tmpl -%%DATADIR%%/templates/cs/option-header.tmpl -%%DATADIR%%/templates/cs/option-pickmany.tmpl -%%DATADIR%%/templates/cs/option-pickone.tmpl -%%DATADIR%%/templates/cs/option-trailer.tmpl -%%DATADIR%%/templates/cs/pager.tmpl -%%DATADIR%%/templates/cs/printer-accept.tmpl -%%DATADIR%%/templates/cs/printer-added.tmpl -%%DATADIR%%/templates/cs/printer-configured.tmpl -%%DATADIR%%/templates/cs/printer-confirm.tmpl -%%DATADIR%%/templates/cs/printer-default.tmpl -%%DATADIR%%/templates/cs/printer-deleted.tmpl -%%DATADIR%%/templates/cs/printer-jobs-header.tmpl -%%DATADIR%%/templates/cs/printer-modified.tmpl -%%DATADIR%%/templates/cs/printer-purge.tmpl -%%DATADIR%%/templates/cs/printer-reject.tmpl -%%DATADIR%%/templates/cs/printer-start.tmpl -%%DATADIR%%/templates/cs/printer-stop.tmpl -%%DATADIR%%/templates/cs/printer.tmpl -%%DATADIR%%/templates/cs/printers-header.tmpl -%%DATADIR%%/templates/cs/printers.tmpl -%%DATADIR%%/templates/cs/restart.tmpl -%%DATADIR%%/templates/cs/samba-export.tmpl -%%DATADIR%%/templates/cs/samba-exported.tmpl -%%DATADIR%%/templates/cs/search.tmpl -%%DATADIR%%/templates/cs/set-printer-options-header.tmpl -%%DATADIR%%/templates/cs/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/cs/subscription-added.tmpl -%%DATADIR%%/templates/cs/subscription-canceled.tmpl -%%DATADIR%%/templates/cs/test-page.tmpl -%%DATADIR%%/templates/cs/trailer.tmpl -%%DATADIR%%/templates/cs/users.tmpl %%DATADIR%%/templates/de/add-class.tmpl %%DATADIR%%/templates/de/add-printer.tmpl %%DATADIR%%/templates/de/add-rss-subscription.tmpl @@ -364,7 +223,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/de/header.tmpl %%DATADIR%%/templates/de/help-header.tmpl %%DATADIR%%/templates/de/help-printable.tmpl -%%DATADIR%%/templates/de/help-trailer.tmpl %%DATADIR%%/templates/de/job-cancel.tmpl %%DATADIR%%/templates/de/job-hold.tmpl %%DATADIR%%/templates/de/job-move.tmpl @@ -386,13 +244,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/de/pager.tmpl %%DATADIR%%/templates/de/printer-accept.tmpl %%DATADIR%%/templates/de/printer-added.tmpl +%%DATADIR%%/templates/de/printer-cancel-jobs.tmpl %%DATADIR%%/templates/de/printer-configured.tmpl %%DATADIR%%/templates/de/printer-confirm.tmpl %%DATADIR%%/templates/de/printer-default.tmpl %%DATADIR%%/templates/de/printer-deleted.tmpl %%DATADIR%%/templates/de/printer-jobs-header.tmpl %%DATADIR%%/templates/de/printer-modified.tmpl -%%DATADIR%%/templates/de/printer-purge.tmpl %%DATADIR%%/templates/de/printer-reject.tmpl %%DATADIR%%/templates/de/printer-start.tmpl %%DATADIR%%/templates/de/printer-stop.tmpl @@ -459,13 +317,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/es/pager.tmpl %%DATADIR%%/templates/es/printer-accept.tmpl %%DATADIR%%/templates/es/printer-added.tmpl +%%DATADIR%%/templates/es/printer-cancel-jobs.tmpl %%DATADIR%%/templates/es/printer-configured.tmpl %%DATADIR%%/templates/es/printer-confirm.tmpl %%DATADIR%%/templates/es/printer-default.tmpl %%DATADIR%%/templates/es/printer-deleted.tmpl %%DATADIR%%/templates/es/printer-jobs-header.tmpl %%DATADIR%%/templates/es/printer-modified.tmpl -%%DATADIR%%/templates/es/printer-purge.tmpl %%DATADIR%%/templates/es/printer-reject.tmpl %%DATADIR%%/templates/es/printer-start.tmpl %%DATADIR%%/templates/es/printer-stop.tmpl @@ -483,150 +341,10 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/es/test-page.tmpl %%DATADIR%%/templates/es/trailer.tmpl %%DATADIR%%/templates/es/users.tmpl -%%DATADIR%%/templates/fr/add-class.tmpl -%%DATADIR%%/templates/fr/add-printer.tmpl -%%DATADIR%%/templates/fr/add-rss-subscription.tmpl -%%DATADIR%%/templates/fr/admin.tmpl -%%DATADIR%%/templates/fr/choose-device.tmpl -%%DATADIR%%/templates/fr/choose-make.tmpl -%%DATADIR%%/templates/fr/choose-model.tmpl -%%DATADIR%%/templates/fr/choose-serial.tmpl -%%DATADIR%%/templates/fr/choose-uri.tmpl -%%DATADIR%%/templates/fr/class-added.tmpl -%%DATADIR%%/templates/fr/class-confirm.tmpl -%%DATADIR%%/templates/fr/class-deleted.tmpl -%%DATADIR%%/templates/fr/class-jobs-header.tmpl -%%DATADIR%%/templates/fr/class-modified.tmpl -%%DATADIR%%/templates/fr/class.tmpl -%%DATADIR%%/templates/fr/classes-header.tmpl -%%DATADIR%%/templates/fr/classes.tmpl -%%DATADIR%%/templates/fr/command.tmpl -%%DATADIR%%/templates/fr/edit-config.tmpl -%%DATADIR%%/templates/fr/error-op.tmpl -%%DATADIR%%/templates/fr/error.tmpl -%%DATADIR%%/templates/fr/header.tmpl -%%DATADIR%%/templates/fr/help-header.tmpl -%%DATADIR%%/templates/fr/help-printable.tmpl -%%DATADIR%%/templates/fr/help-trailer.tmpl -%%DATADIR%%/templates/fr/job-cancel.tmpl -%%DATADIR%%/templates/fr/job-hold.tmpl -%%DATADIR%%/templates/fr/job-move.tmpl -%%DATADIR%%/templates/fr/job-moved.tmpl -%%DATADIR%%/templates/fr/job-release.tmpl -%%DATADIR%%/templates/fr/job-restart.tmpl -%%DATADIR%%/templates/fr/jobs-header.tmpl -%%DATADIR%%/templates/fr/jobs.tmpl -%%DATADIR%%/templates/fr/list-available-printers.tmpl -%%DATADIR%%/templates/fr/modify-class.tmpl -%%DATADIR%%/templates/fr/modify-printer.tmpl -%%DATADIR%%/templates/fr/norestart.tmpl -%%DATADIR%%/templates/fr/option-boolean.tmpl -%%DATADIR%%/templates/fr/option-conflict.tmpl -%%DATADIR%%/templates/fr/option-header.tmpl -%%DATADIR%%/templates/fr/option-pickmany.tmpl -%%DATADIR%%/templates/fr/option-pickone.tmpl -%%DATADIR%%/templates/fr/option-trailer.tmpl -%%DATADIR%%/templates/fr/pager.tmpl -%%DATADIR%%/templates/fr/printer-accept.tmpl -%%DATADIR%%/templates/fr/printer-added.tmpl -%%DATADIR%%/templates/fr/printer-configured.tmpl -%%DATADIR%%/templates/fr/printer-confirm.tmpl -%%DATADIR%%/templates/fr/printer-default.tmpl -%%DATADIR%%/templates/fr/printer-deleted.tmpl -%%DATADIR%%/templates/fr/printer-jobs-header.tmpl -%%DATADIR%%/templates/fr/printer-modified.tmpl -%%DATADIR%%/templates/fr/printer-purge.tmpl -%%DATADIR%%/templates/fr/printer-reject.tmpl -%%DATADIR%%/templates/fr/printer-start.tmpl -%%DATADIR%%/templates/fr/printer-stop.tmpl -%%DATADIR%%/templates/fr/printer.tmpl -%%DATADIR%%/templates/fr/printers-header.tmpl -%%DATADIR%%/templates/fr/printers.tmpl -%%DATADIR%%/templates/fr/restart.tmpl -%%DATADIR%%/templates/fr/samba-export.tmpl -%%DATADIR%%/templates/fr/samba-exported.tmpl -%%DATADIR%%/templates/fr/search.tmpl -%%DATADIR%%/templates/fr/set-printer-options-header.tmpl -%%DATADIR%%/templates/fr/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/fr/subscription-added.tmpl -%%DATADIR%%/templates/fr/subscription-canceled.tmpl -%%DATADIR%%/templates/fr/test-page.tmpl -%%DATADIR%%/templates/fr/trailer.tmpl -%%DATADIR%%/templates/fr/users.tmpl %%DATADIR%%/templates/header.tmpl %%DATADIR%%/templates/help-header.tmpl %%DATADIR%%/templates/help-printable.tmpl %%DATADIR%%/templates/help-trailer.tmpl -%%DATADIR%%/templates/it/add-class.tmpl -%%DATADIR%%/templates/it/add-printer.tmpl -%%DATADIR%%/templates/it/add-rss-subscription.tmpl -%%DATADIR%%/templates/it/admin.tmpl -%%DATADIR%%/templates/it/choose-device.tmpl -%%DATADIR%%/templates/it/choose-make.tmpl -%%DATADIR%%/templates/it/choose-model.tmpl -%%DATADIR%%/templates/it/choose-serial.tmpl -%%DATADIR%%/templates/it/choose-uri.tmpl -%%DATADIR%%/templates/it/class-added.tmpl -%%DATADIR%%/templates/it/class-confirm.tmpl -%%DATADIR%%/templates/it/class-deleted.tmpl -%%DATADIR%%/templates/it/class-jobs-header.tmpl -%%DATADIR%%/templates/it/class-modified.tmpl -%%DATADIR%%/templates/it/class.tmpl -%%DATADIR%%/templates/it/classes-header.tmpl -%%DATADIR%%/templates/it/classes.tmpl -%%DATADIR%%/templates/it/command.tmpl -%%DATADIR%%/templates/it/edit-config.tmpl -%%DATADIR%%/templates/it/error-op.tmpl -%%DATADIR%%/templates/it/error.tmpl -%%DATADIR%%/templates/it/header.tmpl -%%DATADIR%%/templates/it/help-header.tmpl -%%DATADIR%%/templates/it/help-printable.tmpl -%%DATADIR%%/templates/it/help-trailer.tmpl -%%DATADIR%%/templates/it/job-cancel.tmpl -%%DATADIR%%/templates/it/job-hold.tmpl -%%DATADIR%%/templates/it/job-move.tmpl -%%DATADIR%%/templates/it/job-moved.tmpl -%%DATADIR%%/templates/it/job-release.tmpl -%%DATADIR%%/templates/it/job-restart.tmpl -%%DATADIR%%/templates/it/jobs-header.tmpl -%%DATADIR%%/templates/it/jobs.tmpl -%%DATADIR%%/templates/it/list-available-printers.tmpl -%%DATADIR%%/templates/it/modify-class.tmpl -%%DATADIR%%/templates/it/modify-printer.tmpl -%%DATADIR%%/templates/it/norestart.tmpl -%%DATADIR%%/templates/it/option-boolean.tmpl -%%DATADIR%%/templates/it/option-conflict.tmpl -%%DATADIR%%/templates/it/option-header.tmpl -%%DATADIR%%/templates/it/option-pickmany.tmpl -%%DATADIR%%/templates/it/option-pickone.tmpl -%%DATADIR%%/templates/it/option-trailer.tmpl -%%DATADIR%%/templates/it/pager.tmpl -%%DATADIR%%/templates/it/printer-accept.tmpl -%%DATADIR%%/templates/it/printer-added.tmpl -%%DATADIR%%/templates/it/printer-configured.tmpl -%%DATADIR%%/templates/it/printer-confirm.tmpl -%%DATADIR%%/templates/it/printer-default.tmpl -%%DATADIR%%/templates/it/printer-deleted.tmpl -%%DATADIR%%/templates/it/printer-jobs-header.tmpl -%%DATADIR%%/templates/it/printer-modified.tmpl -%%DATADIR%%/templates/it/printer-purge.tmpl -%%DATADIR%%/templates/it/printer-reject.tmpl -%%DATADIR%%/templates/it/printer-start.tmpl -%%DATADIR%%/templates/it/printer-stop.tmpl -%%DATADIR%%/templates/it/printer.tmpl -%%DATADIR%%/templates/it/printers-header.tmpl -%%DATADIR%%/templates/it/printers.tmpl -%%DATADIR%%/templates/it/restart.tmpl -%%DATADIR%%/templates/it/samba-export.tmpl -%%DATADIR%%/templates/it/samba-exported.tmpl -%%DATADIR%%/templates/it/search.tmpl -%%DATADIR%%/templates/it/set-printer-options-header.tmpl -%%DATADIR%%/templates/it/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/it/subscription-added.tmpl -%%DATADIR%%/templates/it/subscription-canceled.tmpl -%%DATADIR%%/templates/it/test-page.tmpl -%%DATADIR%%/templates/it/trailer.tmpl -%%DATADIR%%/templates/it/users.tmpl %%DATADIR%%/templates/ja/add-class.tmpl %%DATADIR%%/templates/ja/add-printer.tmpl %%DATADIR%%/templates/ja/add-rss-subscription.tmpl @@ -673,13 +391,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/ja/pager.tmpl %%DATADIR%%/templates/ja/printer-accept.tmpl %%DATADIR%%/templates/ja/printer-added.tmpl +%%DATADIR%%/templates/ja/printer-cancel-jobs.tmpl %%DATADIR%%/templates/ja/printer-configured.tmpl %%DATADIR%%/templates/ja/printer-confirm.tmpl %%DATADIR%%/templates/ja/printer-default.tmpl %%DATADIR%%/templates/ja/printer-deleted.tmpl %%DATADIR%%/templates/ja/printer-jobs-header.tmpl %%DATADIR%%/templates/ja/printer-modified.tmpl -%%DATADIR%%/templates/ja/printer-purge.tmpl %%DATADIR%%/templates/ja/printer-reject.tmpl %%DATADIR%%/templates/ja/printer-start.tmpl %%DATADIR%%/templates/ja/printer-stop.tmpl @@ -718,87 +436,19 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/pager.tmpl %%DATADIR%%/templates/printer-accept.tmpl %%DATADIR%%/templates/printer-added.tmpl +%%DATADIR%%/templates/printer-cancel-jobs.tmpl %%DATADIR%%/templates/printer-configured.tmpl %%DATADIR%%/templates/printer-confirm.tmpl %%DATADIR%%/templates/printer-default.tmpl %%DATADIR%%/templates/printer-deleted.tmpl %%DATADIR%%/templates/printer-jobs-header.tmpl %%DATADIR%%/templates/printer-modified.tmpl -%%DATADIR%%/templates/printer-purge.tmpl %%DATADIR%%/templates/printer-reject.tmpl %%DATADIR%%/templates/printer-start.tmpl %%DATADIR%%/templates/printer-stop.tmpl %%DATADIR%%/templates/printer.tmpl %%DATADIR%%/templates/printers-header.tmpl %%DATADIR%%/templates/printers.tmpl -%%DATADIR%%/templates/pt_BR/add-class.tmpl -%%DATADIR%%/templates/pt_BR/add-printer.tmpl -%%DATADIR%%/templates/pt_BR/add-rss-subscription.tmpl -%%DATADIR%%/templates/pt_BR/admin.tmpl -%%DATADIR%%/templates/pt_BR/choose-device.tmpl -%%DATADIR%%/templates/pt_BR/choose-make.tmpl -%%DATADIR%%/templates/pt_BR/choose-model.tmpl -%%DATADIR%%/templates/pt_BR/choose-serial.tmpl -%%DATADIR%%/templates/pt_BR/choose-uri.tmpl -%%DATADIR%%/templates/pt_BR/class-added.tmpl -%%DATADIR%%/templates/pt_BR/class-confirm.tmpl -%%DATADIR%%/templates/pt_BR/class-deleted.tmpl -%%DATADIR%%/templates/pt_BR/class-jobs-header.tmpl -%%DATADIR%%/templates/pt_BR/class-modified.tmpl -%%DATADIR%%/templates/pt_BR/class.tmpl -%%DATADIR%%/templates/pt_BR/classes-header.tmpl -%%DATADIR%%/templates/pt_BR/classes.tmpl -%%DATADIR%%/templates/pt_BR/command.tmpl -%%DATADIR%%/templates/pt_BR/edit-config.tmpl -%%DATADIR%%/templates/pt_BR/error-op.tmpl -%%DATADIR%%/templates/pt_BR/error.tmpl -%%DATADIR%%/templates/pt_BR/header.tmpl -%%DATADIR%%/templates/pt_BR/help-header.tmpl -%%DATADIR%%/templates/pt_BR/job-cancel.tmpl -%%DATADIR%%/templates/pt_BR/job-hold.tmpl -%%DATADIR%%/templates/pt_BR/job-move.tmpl -%%DATADIR%%/templates/pt_BR/job-moved.tmpl -%%DATADIR%%/templates/pt_BR/job-release.tmpl -%%DATADIR%%/templates/pt_BR/job-restart.tmpl -%%DATADIR%%/templates/pt_BR/jobs-header.tmpl -%%DATADIR%%/templates/pt_BR/jobs.tmpl -%%DATADIR%%/templates/pt_BR/list-available-printers.tmpl -%%DATADIR%%/templates/pt_BR/modify-class.tmpl -%%DATADIR%%/templates/pt_BR/modify-printer.tmpl -%%DATADIR%%/templates/pt_BR/norestart.tmpl -%%DATADIR%%/templates/pt_BR/option-boolean.tmpl -%%DATADIR%%/templates/pt_BR/option-conflict.tmpl -%%DATADIR%%/templates/pt_BR/option-header.tmpl -%%DATADIR%%/templates/pt_BR/option-pickmany.tmpl -%%DATADIR%%/templates/pt_BR/option-pickone.tmpl -%%DATADIR%%/templates/pt_BR/option-trailer.tmpl -%%DATADIR%%/templates/pt_BR/pager.tmpl -%%DATADIR%%/templates/pt_BR/printer-accept.tmpl -%%DATADIR%%/templates/pt_BR/printer-added.tmpl -%%DATADIR%%/templates/pt_BR/printer-configured.tmpl -%%DATADIR%%/templates/pt_BR/printer-confirm.tmpl -%%DATADIR%%/templates/pt_BR/printer-default.tmpl -%%DATADIR%%/templates/pt_BR/printer-deleted.tmpl -%%DATADIR%%/templates/pt_BR/printer-jobs-header.tmpl -%%DATADIR%%/templates/pt_BR/printer-modified.tmpl -%%DATADIR%%/templates/pt_BR/printer-purge.tmpl -%%DATADIR%%/templates/pt_BR/printer-reject.tmpl -%%DATADIR%%/templates/pt_BR/printer-start.tmpl -%%DATADIR%%/templates/pt_BR/printer-stop.tmpl -%%DATADIR%%/templates/pt_BR/printer.tmpl -%%DATADIR%%/templates/pt_BR/printers-header.tmpl -%%DATADIR%%/templates/pt_BR/printers.tmpl -%%DATADIR%%/templates/pt_BR/restart.tmpl -%%DATADIR%%/templates/pt_BR/samba-export.tmpl -%%DATADIR%%/templates/pt_BR/samba-exported.tmpl -%%DATADIR%%/templates/pt_BR/search.tmpl -%%DATADIR%%/templates/pt_BR/set-printer-options-header.tmpl -%%DATADIR%%/templates/pt_BR/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/pt_BR/subscription-added.tmpl -%%DATADIR%%/templates/pt_BR/subscription-canceled.tmpl -%%DATADIR%%/templates/pt_BR/test-page.tmpl -%%DATADIR%%/templates/pt_BR/trailer.tmpl -%%DATADIR%%/templates/pt_BR/users.tmpl %%DATADIR%%/templates/restart.tmpl %%DATADIR%%/templates/ru/add-class.tmpl %%DATADIR%%/templates/ru/add-printer.tmpl @@ -824,7 +474,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/ru/header.tmpl %%DATADIR%%/templates/ru/help-header.tmpl %%DATADIR%%/templates/ru/help-printable.tmpl -%%DATADIR%%/templates/ru/help-trailer.tmpl %%DATADIR%%/templates/ru/job-cancel.tmpl %%DATADIR%%/templates/ru/job-hold.tmpl %%DATADIR%%/templates/ru/job-move.tmpl @@ -846,13 +495,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/ru/pager.tmpl %%DATADIR%%/templates/ru/printer-accept.tmpl %%DATADIR%%/templates/ru/printer-added.tmpl +%%DATADIR%%/templates/ru/printer-cancel-jobs.tmpl %%DATADIR%%/templates/ru/printer-configured.tmpl %%DATADIR%%/templates/ru/printer-confirm.tmpl %%DATADIR%%/templates/ru/printer-default.tmpl %%DATADIR%%/templates/ru/printer-deleted.tmpl %%DATADIR%%/templates/ru/printer-jobs-header.tmpl %%DATADIR%%/templates/ru/printer-modified.tmpl -%%DATADIR%%/templates/ru/printer-purge.tmpl %%DATADIR%%/templates/ru/printer-reject.tmpl %%DATADIR%%/templates/ru/printer-start.tmpl %%DATADIR%%/templates/ru/printer-stop.tmpl @@ -881,13 +530,11 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/trailer.tmpl %%DATADIR%%/templates/users.tmpl %%LIBUSB%%%%DATADIR%%/usb/org.cups.usb-quirks -%%DOCSDIR%%/ca/index.html -%%DOCSDIR%%/cs/index.html +%%DOCSDIR%%/apple-touch-icon.png %%DOCSDIR%%/cups-printable.css %%DOCSDIR%%/cups.css %%DOCSDIR%%/de/index.html %%DOCSDIR%%/es/index.html -%%DOCSDIR%%/fr/index.html %%DOCSDIR%%/help/accounting.html %%DOCSDIR%%/help/api-array.html %%DOCSDIR%%/help/api-cgi.html @@ -907,11 +554,18 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/license.html %%DOCSDIR%%/help/man-backend.html %%DOCSDIR%%/help/man-cancel.html +%%DOCSDIR%%/help/man-classes.conf.html +%%DOCSDIR%%/help/man-client.conf.html %%DOCSDIR%%/help/man-cups-config.html +%%DOCSDIR%%/help/man-cups-files.conf.html %%DOCSDIR%%/help/man-cups-lpd.html %%DOCSDIR%%/help/man-cups-snmp.html +%%DOCSDIR%%/help/man-cups.html %%DOCSDIR%%/help/man-cupsaccept.html %%DOCSDIR%%/help/man-cupsaddsmb.html +%%DOCSDIR%%/help/man-cupsd-helper.html +%%DOCSDIR%%/help/man-cupsd-logs.html +%%DOCSDIR%%/help/man-cupsd.conf.html %%DOCSDIR%%/help/man-cupsd.html %%DOCSDIR%%/help/man-cupsenable.html %%DOCSDIR%%/help/man-cupstestdsc.html @@ -925,7 +579,6 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/man-lpinfo.html %%DOCSDIR%%/help/man-lpmove.html %%DOCSDIR%%/help/man-lpoptions.html -%%DOCSDIR%%/help/man-lppasswd.html %%DOCSDIR%%/help/man-lpq.html %%DOCSDIR%%/help/man-lpr.html %%DOCSDIR%%/help/man-lprm.html @@ -938,6 +591,8 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/man-ppdi.html %%DOCSDIR%%/help/man-ppdmerge.html %%DOCSDIR%%/help/man-ppdpo.html +%%DOCSDIR%%/help/man-printers.conf.html +%%DOCSDIR%%/help/man-subscriptions.conf.html %%DOCSDIR%%/help/network.html %%DOCSDIR%%/help/options.html %%DOCSDIR%%/help/overview.html @@ -945,18 +600,7 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/postscript-driver.html %%DOCSDIR%%/help/ppd-compiler.html %%DOCSDIR%%/help/raster-driver.html -%%DOCSDIR%%/help/ref-access_log.html -%%DOCSDIR%%/help/ref-classes-conf.html -%%DOCSDIR%%/help/ref-client-conf.html -%%DOCSDIR%%/help/ref-cups-files-conf.html -%%DOCSDIR%%/help/ref-cupsd-conf.html -%%DOCSDIR%%/help/ref-error_log.html -%%DOCSDIR%%/help/ref-mailto-conf.html -%%DOCSDIR%%/help/ref-page_log.html %%DOCSDIR%%/help/ref-ppdcfile.html -%%DOCSDIR%%/help/ref-printers-conf.html -%%DOCSDIR%%/help/ref-snmp-conf.html -%%DOCSDIR%%/help/ref-subscriptions-conf.html %%DOCSDIR%%/help/security.html %%DOCSDIR%%/help/sharing.html %%DOCSDIR%%/help/spec-banner.html @@ -970,7 +614,6 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/spec-raster.html %%DOCSDIR%%/help/spec-stp.html %%DOCSDIR%%/help/translation.html -%%DOCSDIR%%/help/whatsnew.html %%DOCSDIR%%/images/color-wheel.png %%DOCSDIR%%/images/cups-block-diagram.png %%DOCSDIR%%/images/cups-command-chain.png @@ -978,6 +621,7 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/images/cups-postscript-chain.png %%DOCSDIR%%/images/cups-raster-chain.png %%DOCSDIR%%/images/cups.png +%%DOCSDIR%%/images/generic.png %%DOCSDIR%%/images/left.gif %%DOCSDIR%%/images/raster-organization.png %%DOCSDIR%%/images/raster.png @@ -988,9 +632,7 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/images/unsel.gif %%DOCSDIR%%/images/wait.gif %%DOCSDIR%%/index.html -%%DOCSDIR%%/it/index.html %%DOCSDIR%%/ja/index.html -%%DOCSDIR%%/pt_BR/index.html %%DOCSDIR%%/robots.txt %%DOCSDIR%%/ru/index.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ulpt-cupsd.conf @@ -1006,7 +648,6 @@ share/locale/es/cups_es.po share/locale/fr/cups_fr.po share/locale/it/cups_it.po share/locale/ja/cups_ja.po -share/locale/pt_BR/cups_pt_BR.po share/locale/ru/cups_ru.po @dir etc/cups/interfaces @dir etc/cups/ppd