- update to 1.2.2 [1]

- tell in pkg-message about permissions needed [2] [3]
- fix man / mlink install [4] [5]
- don't remove dirs listed in bsd.local.dist [6]
- conflict with LPRng [7]
- fix OPTIONS handling [8]
- fix printing raw data using application/octet-stream [9]
- some other small fixes

Please note that the biggest part of the work was done by Marcin Wisnicki and
this commit it's based manly on his work.

PR:		ports/99624 [1]
		ports/99460 [2]	ports/99745 [3]
		ports/99798 [4] ports/101175 [5]
		ports/100865 [6]
		ports/99791 [7]
		ports/99786 [8]
		ports/99707 [9]
Submitted by:	Marcin Wisnicki [1]
		Nicolas Blais [2],Osamu Hasegawa [3]
		Tsurutani Naoki [4], Dominic Fandrey [5]
		Stanislav Sedov [6]
		Leif Pedersen [7]
		Harald Schmalzbauer [8]
		Jonathan Fosburgh [9]
Rewiev by:	many with no objections
Approved by:	maintainer timeout

6 files changed, 539 insertions, 392 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 4f49fd243b0a..1ab81ce93632 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	cups-base
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.2.2
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp.ntua.gr/pub/gnu/cups/${PORTVERSION}/ \
@@ -21,7 +20,9 @@ DISTNAME=	cups-${PORTVERSION}-source
 MAINTAINER=	asa@agava.com
 COMMENT=	The Common UNIX Printing System
 
-INSTALLS_SHLIB=	yes
+CONFLICTS=	LPRng-[0-9]*
+
+USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_RUN=	yes
@@ -35,12 +36,15 @@ OPTIONS=	GNUTLS		"Build with GNUTLS library" on \
 		PYTHON		"Build PYTHON support" off \
 		LIBPAPER	"Build with libpaper support" off
 
-CUPS_FILESDIR=	${.CURDIR}/../../print/cups/files
+.include <bsd.port.pre.mk>
+
+CUPS_FILESDIR=	${PORTSDIR}/print/cups/files
 CUPS_ETCDIR=	${PREFIX}/etc/cups
 CUPS_RCDIR=	${PREFIX}/etc/rc.d
 CUPS_DOCSDIR=	${PREFIX}/share/doc/cups
 CUPS_SPOOLDIR=	/var/spool/cups
 CUPS_SOCKET?=	/var/run/cups.sock
+DOCSDIR=	${CUPS_DOCSDIR}
 WRKSRC=		${WRKDIR}/cups-${PORTVERSION}
 
 # file, dir ownership
@@ -71,14 +75,18 @@ LIB_DEPENDS+=		gnutls-openssl.13:${PORTSDIR}/security/gnutls
 
 .if defined(WITH_PHP)
 CONFIGURE_ARGS+=	--with-php
-RUN_DEPENDS+=		php:${PORTSDIR}/lang/php4
+USE_PHP=		yes
+PLIST_SUB+=		PHP=""
+.include "${PORTSDIR}/Mk/bsd.php.mk"
 .else
 CONFIGURE_ARGS+=	--without-php
+PLIST_SUB+=		PHP="@comment "
 .endif
 
 .if defined(WITH_PYTHON)
 CONFIGURE_ARGS+=	--with-python
 USE_PYTHON=		yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
 .endif
 
 .if defined(WITH_LIBPAPER)
@@ -95,7 +103,7 @@ MAN5EXT=	5
 MAN7EXT=	7
 MAN8EXT=	8
 
-MAN1=	cancel.$(MAN1EXT) \
+MAN1=	cancel.${MAN1EXT} \
 	cups-config.$(MAN1EXT) \
 	cupstestdsc.$(MAN1EXT) \
 	cupstestppd.$(MAN1EXT) \
@@ -110,6 +118,7 @@ MAN5=	classes.conf.$(MAN5EXT) \
 	client.conf.$(MAN5EXT) \
 	cups-snmp.conf.$(MAN5EXT) \
 	cupsd.conf.$(MAN5EXT) \
+	mailto.conf.$(MAN5EXT) \
 	mime.convs.$(MAN5EXT) \
 	mime.types.$(MAN5EXT) \
 	printers.conf.$(MAN5EXT) \
@@ -127,7 +136,9 @@ MAN8=	accept.$(MAN8EXT) \
 	lpadmin.$(MAN8EXT) \
 	lpinfo.$(MAN8EXT) \
 	lpmove.$(MAN8EXT) \
-	lpc.$(MAN8EXT) \
+	lpc.$(MAN8EXT)
+MLINKS=	accept.$(MAN8EXT) reject.$(MAN8EXT) \
+	cupsenable.$(MAN8EXT) cupsdisable.$(MAN8EXT)
 
 pre-configure::
 	@${ECHO_MSG} Configuring CUPS with options:
@@ -164,4 +175,4 @@ post-install:
 	${CHMOD} -R g+w ${CUPS_SPOOLDIR}
 	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index b7cfa4c47c92..d418bc64ca1e 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (cups-1.2.0-source.tar.bz2) = a168b0b1c8bb946060e659e1df2927c5
-SHA256 (cups-1.2.0-source.tar.bz2) = 893a91d96e68de51f767d97d36d2d321320b3611b7178ea9a9d17ad2777f5f9f
-SIZE (cups-1.2.0-source.tar.bz2) = 3456476
+MD5 (cups-1.2.2-source.tar.bz2) = 091de9109c9252cb37427859e90190ad
+SHA256 (cups-1.2.2-source.tar.bz2) = 16dad788e7d2060a3b59778edb1c39c2354c800c127fe6768f8005580533e776
+SIZE (cups-1.2.2-source.tar.bz2) = 3527322
diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile
index fbb6d493b206..9204c155429c 100644
--- a/print/cups-base/files/patch-Makefile
+++ b/print/cups-base/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	Thu May 18 13:38:50 2006
-+++ Makefile	Thu May 18 13:40:07 2006
-@@ -99,56 +99,11 @@
+--- Makefile.orig	Fri May 19 14:44:29 2006
++++ Makefile	Thu Jun 29 22:07:22 2006
+@@ -99,57 +99,10 @@
  	echo Installing cups-config script...
  	$(INSTALL_DIR) -m 755 $(BINDIR)
  	$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
--	echo Installing startup script...
 -	if test "x$(INITDIR)" != x; then \
+-		echo Installing init scripts...; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \
 -		$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \
@@ -20,13 +20,16 @@
 -	if test "x$(INITDIR)" = x -a "x$(INITDDIR)" != x; then \
 -		$(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
 -		if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+-			echo Installing StartupItems files...; \
 -			$(INSTALL_SCRIPT) init/PrintingServices $(BUILDROOT)$(INITDDIR)/PrintingServices; \
 -			$(INSTALL_DATA) init/StartupParameters.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \
 -			$(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \
 -			$(INSTALL_DATA) init/Localizable.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \
 -		elif test "$(INITDDIR)" = "/System/Library/LaunchDaemons"; then \
+-			echo Installing LaunchDaemons configuration file...; \
 -			$(INSTALL_DATA) init/org.cups.cupsd.plist $(BUILDROOT)$(DEFAULT_LAUNCHD_CONF); \
 -		else \
+-			echo Installing RC script...; \
 -			$(INSTALL_SCRIPT) init/cups.sh $(BUILDROOT)$(INITDDIR)/cups; \
 -		fi \
 -	fi
@@ -34,7 +37,7 @@
  		echo Installing cups.conf in $(DBUSDIR)...;\
  		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(DBUSDIR); \
  		$(INSTALL_DATA) packaging/cups-dbus.conf $(BUILDROOT)$(DBUSDIR)/cups.conf; \
- 	fi
+-	fi
 -	if test "x$(XINETD)" != x; then \
 -		echo Installing xinetd configuration file for cups-lpd...; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
@@ -52,8 +55,6 @@
 -		$(INSTALL_DATA) desktop/cups-64.png $(BUILDROOT)/usr/share/icons/hicolor/64x64/apps/cups.png; \
 -		$(INSTALL_DIR) -m 755 $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps; \
 -		$(INSTALL_DATA) desktop/cups-128.png $(BUILDROOT)/usr/share/icons/hicolor/128x128/apps/cups.png; \
--	fi
--
+ 	fi
+ 
  
- #
- # Install source and header files...
diff --git a/print/cups-base/pkg-descr b/print/cups-base/pkg-descr
index c9ab263133fb..0d4fa7369425 100644
--- a/print/cups-base/pkg-descr
+++ b/print/cups-base/pkg-descr
@@ -9,8 +9,7 @@ also supported with reduced functionality. CUPS adds network printer
 browsing and PostScript Printer Description ("PPD") based printing
 options to support real-world printing under UNIX.
 
-CUPS provides the System V and Berkeley command-line interfaces. These are
-available in the cups-lpr port.
+CUPS provides the System V and Berkeley command-line interfaces.
 
 CUPS also supports a customized version of GNU Ghostscript (currently based
 off GNU Ghostscript 5.50) and an image file RIP that are used to support
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index 89ed604dac28..9d58d1d7e8bd 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -2,7 +2,24 @@
 PLEASE NOTE:
 ============
 
-To enable printing under Gimp do the following:
+To enable printing with local printer you need to give group cups
+r/w access to printer device:
+
+1) Add following to /etc/devfs.rules (create if it doesn't exits):
+
+[system=10]
+add path 'unlpt*' mode 0660 group cups
+add path 'ulpt*' mode 0660 group cups
+add path 'lpt*' mode 0660 group cups
+
+2) And following to /etc/rc.conf:
+
+devfs_system_ruleset="system"
+
+3) Restart devfs: /etc/rc.d/devfs restart
+
+To enable printing under Gimp and MS-Windows clients do the following:
+
 1) Uncomment application/octet-stream line in mime.types
 2) Uncomment application/octet-stream line in mime.convs
 3) Restart cupsd
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 5812b0e5e87a..fed1cfd5aee6 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -43,363 +43,417 @@ lib/libcups.so
 lib/libcups.so.2
 lib/libcupsimage.so
 lib/libcupsimage.so.2
-@comment Put man links here
-man/man8/reject.8
-man/man8/cupsdisable.8
+%%PHP%%lib/php/%%PHP_EXT_DIR%%/phpcups.so
 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
+%%DOCSDIR%%/cups.css
+%%DOCSDIR%%/cups-printable.css
+%%DOCSDIR%%/favicon.ico
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/robots.txt
+%%DOCSDIR%%/de/images/button-accept-jobs.gif
+%%DOCSDIR%%/de/images/button-add-class.gif
+%%DOCSDIR%%/de/images/button-add-printer.gif
+%%DOCSDIR%%/de/images/button-add-this-printer.gif
+%%DOCSDIR%%/de/images/button-cancel-all-jobs.gif
+%%DOCSDIR%%/de/images/button-cancel-job.gif
+%%DOCSDIR%%/de/images/button-change-settings.gif
+%%DOCSDIR%%/de/images/button-clean-print-heads.gif
+%%DOCSDIR%%/de/images/button-clear.gif
+%%DOCSDIR%%/de/images/button-continue.gif
+%%DOCSDIR%%/de/images/button-delete-class.gif
+%%DOCSDIR%%/de/images/button-delete-printer.gif
+%%DOCSDIR%%/de/images/button-edit-configuration-file.gif
+%%DOCSDIR%%/de/images/button-export-samba.gif
+%%DOCSDIR%%/de/images/button-help.gif
+%%DOCSDIR%%/de/images/button-hold-job.gif
+%%DOCSDIR%%/de/images/button-manage-classes.gif
+%%DOCSDIR%%/de/images/button-manage-jobs.gif
+%%DOCSDIR%%/de/images/button-manage-printers.gif
+%%DOCSDIR%%/de/images/button-manage-server.gif
+%%DOCSDIR%%/de/images/button-modify-class.gif
+%%DOCSDIR%%/de/images/button-modify-printer.gif
+%%DOCSDIR%%/de/images/button-move-job.gif
+%%DOCSDIR%%/de/images/button-move-jobs.gif
+%%DOCSDIR%%/de/images/button-print-self-test-page.gif
+%%DOCSDIR%%/de/images/button-print-test-page.gif
+%%DOCSDIR%%/de/images/button-publish-printer.gif
+%%DOCSDIR%%/de/images/button-reject-jobs.gif
+%%DOCSDIR%%/de/images/button-release-job.gif
+%%DOCSDIR%%/de/images/button-restart-job.gif
+%%DOCSDIR%%/de/images/button-save-changes.gif
+%%DOCSDIR%%/de/images/button-search.gif
+%%DOCSDIR%%/de/images/button-set-allowed-users.gif
+%%DOCSDIR%%/de/images/button-set-as-default.gif
+%%DOCSDIR%%/de/images/button-set-printer-options.gif
+%%DOCSDIR%%/de/images/button-show-active.gif
+%%DOCSDIR%%/de/images/button-show-all.gif
+%%DOCSDIR%%/de/images/button-show-completed.gif
+%%DOCSDIR%%/de/images/button-show-next.gif
+%%DOCSDIR%%/de/images/button-show-previous.gif
+%%DOCSDIR%%/de/images/button-sort-ascending.gif
+%%DOCSDIR%%/de/images/button-sort-descending.gif
+%%DOCSDIR%%/de/images/button-start-class.gif
+%%DOCSDIR%%/de/images/button-start-printer.gif
+%%DOCSDIR%%/de/images/button-stop-class.gif
+%%DOCSDIR%%/de/images/button-stop-printer.gif
+%%DOCSDIR%%/de/images/button-unpublish-printer.gif
+%%DOCSDIR%%/de/images/button-view-access-log.gif
+%%DOCSDIR%%/de/images/button-view-error-log.gif
+%%DOCSDIR%%/de/images/button-view-page-log.gif
+%%DOCSDIR%%/de/images/button-view-printable-version.gif
+%%DOCSDIR%%/de/index.html
+%%DOCSDIR%%/help/api-array.html
+%%DOCSDIR%%/help/api-cups.html
+%%DOCSDIR%%/help/api-filedir.html
+%%DOCSDIR%%/help/api-filter.html
+%%DOCSDIR%%/help/api-httpipp.html
+%%DOCSDIR%%/help/api-ppd.html
+%%DOCSDIR%%/help/api-raster.html
+%%DOCSDIR%%/help/cgi.html
+%%DOCSDIR%%/help/glossary.html
+%%DOCSDIR%%/help/license.html
+%%DOCSDIR%%/help/man-accept.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-lpd.html
+%%DOCSDIR%%/help/man-cups-polld.html
+%%DOCSDIR%%/help/man-cupsaddsmb.html
+%%DOCSDIR%%/help/man-cupsd.conf.html
+%%DOCSDIR%%/help/man-filter.html
+%%DOCSDIR%%/help/man-mime.convs.html
+%%DOCSDIR%%/help/man-mime.types.html
+%%DOCSDIR%%/help/man-printers.conf.html
+%%DOCSDIR%%/help/network.html
+%%DOCSDIR%%/help/options.html
+%%DOCSDIR%%/help/overview.html
+%%DOCSDIR%%/help/policies.html
+%%DOCSDIR%%/help/ref-access_log.html
+%%DOCSDIR%%/help/ref-classes-conf.html
+%%DOCSDIR%%/help/ref-client-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-printers-conf.html
+%%DOCSDIR%%/help/ref-snmp-conf.html
+%%DOCSDIR%%/help/ref-subscriptions-conf.html
+%%DOCSDIR%%/help/security.html
+%%DOCSDIR%%/help/spec-cmp.html
+%%DOCSDIR%%/help/spec-command.html
+%%DOCSDIR%%/help/spec-design.html
+%%DOCSDIR%%/help/spec-ipp.html
+%%DOCSDIR%%/help/spec-ppd.html
+%%DOCSDIR%%/help/spec-raster.html
+%%DOCSDIR%%/help/spec-stp.html
+%%DOCSDIR%%/help/standard.html
+%%DOCSDIR%%/help/translation.html
+%%DOCSDIR%%/help/whatsnew.html
+%%DOCSDIR%%/help/man-cupsd.html
+%%DOCSDIR%%/help/man-cupsenable.html
+%%DOCSDIR%%/help/man-cupstestdsc.html
+%%DOCSDIR%%/help/man-cupstestppd.html
+%%DOCSDIR%%/help/man-lp.html
+%%DOCSDIR%%/help/man-lpadmin.html
+%%DOCSDIR%%/help/man-lpc.html
+%%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
+%%DOCSDIR%%/help/man-lpstat.html
+%%DOCSDIR%%/images/bottom-left.gif
+%%DOCSDIR%%/images/bottom-right.gif
+%%DOCSDIR%%/images/classes.gif
+%%DOCSDIR%%/images/cups-block-diagram.gif
+%%DOCSDIR%%/images/esp-logo.gif
+%%DOCSDIR%%/images/happy.gif
+%%DOCSDIR%%/images/logo.gif
+%%DOCSDIR%%/images/printer-idle.gif
+%%DOCSDIR%%/images/printer-processing.gif
+%%DOCSDIR%%/images/printer-stopped.gif
+%%DOCSDIR%%/images/smiley.jpg
+%%DOCSDIR%%/images/tab-left.gif
+%%DOCSDIR%%/images/tab-right.gif
+%%DOCSDIR%%/images/top-left.gif
+%%DOCSDIR%%/images/top-middle.gif
+%%DOCSDIR%%/images/top-right.gif
+%%DOCSDIR%%/images/web-add-this-printer.gif
+%%DOCSDIR%%/images/web-password.gif
+%%DOCSDIR%%/images/web-test-page.gif
+%%DOCSDIR%%/images/web-printer-driver.gif
+%%DOCSDIR%%/images/web-printer-status.gif
+%%DOCSDIR%%/images/web-set-printer-options.gif
+%%DOCSDIR%%/images/button-accept-jobs.gif
+%%DOCSDIR%%/images/button-add-class.gif
+%%DOCSDIR%%/images/button-add-printer.gif
+%%DOCSDIR%%/images/button-add-this-printer.gif
+%%DOCSDIR%%/images/button-cancel-all-jobs.gif
+%%DOCSDIR%%/images/button-cancel-job.gif
+%%DOCSDIR%%/images/button-change-settings.gif
+%%DOCSDIR%%/images/button-clean-print-heads.gif
+%%DOCSDIR%%/images/button-clear.gif
+%%DOCSDIR%%/images/button-continue.gif
+%%DOCSDIR%%/images/button-delete-class.gif
+%%DOCSDIR%%/images/button-delete-printer.gif
+%%DOCSDIR%%/images/button-edit-configuration-file.gif
+%%DOCSDIR%%/images/button-export-samba.gif
+%%DOCSDIR%%/images/button-help.gif
+%%DOCSDIR%%/images/button-hold-job.gif
+%%DOCSDIR%%/images/button-manage-classes.gif
+%%DOCSDIR%%/images/button-manage-jobs.gif
+%%DOCSDIR%%/images/button-manage-printers.gif
+%%DOCSDIR%%/images/button-manage-server.gif
+%%DOCSDIR%%/images/button-modify-class.gif
+%%DOCSDIR%%/images/button-modify-printer.gif
+%%DOCSDIR%%/images/button-move-job.gif
+%%DOCSDIR%%/images/button-move-jobs.gif
+%%DOCSDIR%%/images/button-print-self-test-page.gif
+%%DOCSDIR%%/images/button-print-test-page.gif
+%%DOCSDIR%%/images/button-publish-printer.gif
+%%DOCSDIR%%/images/button-reject-jobs.gif
+%%DOCSDIR%%/images/button-release-job.gif
+%%DOCSDIR%%/images/button-restart-job.gif
+%%DOCSDIR%%/images/button-save-changes.gif
+%%DOCSDIR%%/images/button-search.gif
+%%DOCSDIR%%/images/button-set-allowed-users.gif
+%%DOCSDIR%%/images/button-set-as-default.gif
+%%DOCSDIR%%/images/button-set-printer-options.gif
+%%DOCSDIR%%/images/button-show-active.gif
+%%DOCSDIR%%/images/button-show-all.gif
+%%DOCSDIR%%/images/button-show-completed.gif
+%%DOCSDIR%%/images/button-show-next.gif
+%%DOCSDIR%%/images/button-show-previous.gif
+%%DOCSDIR%%/images/button-sort-ascending.gif
+%%DOCSDIR%%/images/button-sort-descending.gif
+%%DOCSDIR%%/images/button-start-class.gif
+%%DOCSDIR%%/images/button-start-printer.gif
+%%DOCSDIR%%/images/button-stop-class.gif
+%%DOCSDIR%%/images/button-stop-printer.gif
+%%DOCSDIR%%/images/button-unpublish-printer.gif
+%%DOCSDIR%%/images/button-use-default-config.gif
+%%DOCSDIR%%/images/button-view-access-log.gif
+%%DOCSDIR%%/images/button-view-error-log.gif
+%%DOCSDIR%%/images/button-view-page-log.gif
+%%DOCSDIR%%/images/button-view-printable-version.gif
+%%DOCSDIR%%/es/images/button-accept-jobs.gif
+%%DOCSDIR%%/es/images/button-add-class.gif
+%%DOCSDIR%%/es/images/button-add-printer.gif
+%%DOCSDIR%%/es/images/button-add-this-printer.gif
+%%DOCSDIR%%/es/images/button-cancel-all-jobs.gif
+%%DOCSDIR%%/es/images/button-cancel-job.gif
+%%DOCSDIR%%/es/images/button-change-settings.gif
+%%DOCSDIR%%/es/images/button-clean-print-heads.gif
+%%DOCSDIR%%/es/images/button-clear.gif
+%%DOCSDIR%%/es/images/button-continue.gif
+%%DOCSDIR%%/es/images/button-delete-class.gif
+%%DOCSDIR%%/es/images/button-delete-printer.gif
+%%DOCSDIR%%/es/images/button-edit-configuration-file.gif
+%%DOCSDIR%%/es/images/button-export-samba.gif
+%%DOCSDIR%%/es/images/button-help.gif
+%%DOCSDIR%%/es/images/button-hold-job.gif
+%%DOCSDIR%%/es/images/button-manage-classes.gif
+%%DOCSDIR%%/es/images/button-manage-jobs.gif
+%%DOCSDIR%%/es/images/button-manage-printers.gif
+%%DOCSDIR%%/es/images/button-manage-server.gif
+%%DOCSDIR%%/es/images/button-modify-class.gif
+%%DOCSDIR%%/es/images/button-modify-printer.gif
+%%DOCSDIR%%/es/images/button-move-job.gif
+%%DOCSDIR%%/es/images/button-move-jobs.gif
+%%DOCSDIR%%/es/images/button-print-self-test-page.gif
+%%DOCSDIR%%/es/images/button-print-test-page.gif
+%%DOCSDIR%%/es/images/button-publish-printer.gif
+%%DOCSDIR%%/es/images/button-reject-jobs.gif
+%%DOCSDIR%%/es/images/button-release-job.gif
+%%DOCSDIR%%/es/images/button-restart-job.gif
+%%DOCSDIR%%/es/images/button-save-changes.gif
+%%DOCSDIR%%/es/images/button-search.gif
+%%DOCSDIR%%/es/images/button-set-allowed-users.gif
+%%DOCSDIR%%/es/images/button-set-as-default.gif
+%%DOCSDIR%%/es/images/button-set-printer-options.gif
+%%DOCSDIR%%/es/images/button-show-active.gif
+%%DOCSDIR%%/es/images/button-show-all.gif
+%%DOCSDIR%%/es/images/button-show-completed.gif
+%%DOCSDIR%%/es/images/button-show-next.gif
+%%DOCSDIR%%/es/images/button-show-previous.gif
+%%DOCSDIR%%/es/images/button-sort-ascending.gif
+%%DOCSDIR%%/es/images/button-sort-descending.gif
+%%DOCSDIR%%/es/images/button-start-class.gif
+%%DOCSDIR%%/es/images/button-start-printer.gif
+%%DOCSDIR%%/es/images/button-stop-class.gif
+%%DOCSDIR%%/es/images/button-stop-printer.gif
+%%DOCSDIR%%/es/images/button-unpublish-printer.gif
+%%DOCSDIR%%/es/images/button-use-default-config.gif
+%%DOCSDIR%%/es/images/button-view-access-log.gif
+%%DOCSDIR%%/es/images/button-view-error-log.gif
+%%DOCSDIR%%/es/images/button-view-page-log.gif
+%%DOCSDIR%%/es/images/button-view-printable-version.gif
+%%DOCSDIR%%/es/index.html
+%%DOCSDIR%%/ja/images/button-accept-jobs.gif
+%%DOCSDIR%%/ja/images/button-add-class.gif
+%%DOCSDIR%%/ja/images/button-add-printer.gif
+%%DOCSDIR%%/ja/images/button-add-this-printer.gif
+%%DOCSDIR%%/ja/images/button-cancel-all-jobs.gif
+%%DOCSDIR%%/ja/images/button-cancel-job.gif
+%%DOCSDIR%%/ja/images/button-change-settings.gif
+%%DOCSDIR%%/ja/images/button-continue.gif
+%%DOCSDIR%%/ja/images/button-delete-class.gif
+%%DOCSDIR%%/ja/images/button-delete-printer.gif
+%%DOCSDIR%%/ja/images/button-edit-configuration-file.gif
+%%DOCSDIR%%/ja/images/button-export-samba.gif
+%%DOCSDIR%%/ja/images/button-help.gif
+%%DOCSDIR%%/ja/images/button-hold-job.gif
+%%DOCSDIR%%/ja/images/button-move-job.gif
+%%DOCSDIR%%/ja/images/button-manage-classes.gif
+%%DOCSDIR%%/ja/images/button-manage-jobs.gif
+%%DOCSDIR%%/ja/images/button-manage-printers.gif
+%%DOCSDIR%%/ja/images/button-manage-server.gif
+%%DOCSDIR%%/ja/images/button-modify-class.gif
+%%DOCSDIR%%/ja/images/button-modify-printer.gif
+%%DOCSDIR%%/ja/images/button-move-jobs.gif
+%%DOCSDIR%%/ja/images/button-print-test-page.gif
+%%DOCSDIR%%/ja/images/button-publish-printer.gif
+%%DOCSDIR%%/ja/images/button-reject-jobs.gif
+%%DOCSDIR%%/ja/images/button-release-job.gif
+%%DOCSDIR%%/ja/images/button-restart-job.gif
+%%DOCSDIR%%/ja/images/button-save-changes.gif
+%%DOCSDIR%%/ja/images/button-search.gif
+%%DOCSDIR%%/ja/images/button-set-allowed-users.gif
+%%DOCSDIR%%/ja/images/button-set-as-default.gif
+%%DOCSDIR%%/ja/images/button-set-printer-options.gif
+%%DOCSDIR%%/ja/images/button-show-active.gif
+%%DOCSDIR%%/ja/images/button-show-all.gif
+%%DOCSDIR%%/ja/images/button-show-completed.gif
+%%DOCSDIR%%/ja/images/button-show-next.gif
+%%DOCSDIR%%/ja/images/button-show-previous.gif
+%%DOCSDIR%%/ja/images/button-sort-ascending.gif
+%%DOCSDIR%%/ja/images/button-sort-descending.gif
+%%DOCSDIR%%/ja/images/button-start-class.gif
+%%DOCSDIR%%/ja/images/button-start-printer.gif
+%%DOCSDIR%%/ja/images/button-stop-class.gif
+%%DOCSDIR%%/ja/images/button-stop-printer.gif
+%%DOCSDIR%%/ja/images/button-unpublish-printer.gif
+%%DOCSDIR%%/ja/images/button-use-default-config.gif
+%%DOCSDIR%%/ja/images/button-view-access-log.gif
+%%DOCSDIR%%/ja/images/button-view-error-log.gif
+%%DOCSDIR%%/ja/images/button-view-page-log.gif
+%%DOCSDIR%%/ja/index.html
+%%DOCSDIR%%/pl/images/button-accept-jobs.gif
+%%DOCSDIR%%/pl/images/button-add-class.gif
+%%DOCSDIR%%/pl/images/button-add-printer.gif
+%%DOCSDIR%%/pl/images/button-add-this-printer.gif
+%%DOCSDIR%%/pl/images/button-cancel-all-jobs.gif
+%%DOCSDIR%%/pl/images/button-cancel-job.gif
+%%DOCSDIR%%/pl/images/button-change-settings.gif
+%%DOCSDIR%%/pl/images/button-clean-print-heads.gif
+%%DOCSDIR%%/pl/images/button-clear.gif
+%%DOCSDIR%%/pl/images/button-continue.gif
+%%DOCSDIR%%/pl/images/button-delete-class.gif
+%%DOCSDIR%%/pl/images/button-delete-printer.gif
+%%DOCSDIR%%/pl/images/button-edit-configuration-file.gif
+%%DOCSDIR%%/pl/images/button-export-samba.gif
+%%DOCSDIR%%/pl/images/button-help.gif
+%%DOCSDIR%%/pl/images/button-hold-job.gif
+%%DOCSDIR%%/pl/images/button-manage-classes.gif
+%%DOCSDIR%%/pl/images/button-manage-jobs.gif
+%%DOCSDIR%%/pl/images/button-manage-printers.gif
+%%DOCSDIR%%/pl/images/button-manage-server.gif
+%%DOCSDIR%%/pl/images/button-modify-class.gif
+%%DOCSDIR%%/pl/images/button-modify-printer.gif
+%%DOCSDIR%%/pl/images/button-move-job.gif
+%%DOCSDIR%%/pl/images/button-move-jobs.gif
+%%DOCSDIR%%/pl/images/button-print-self-test-page.gif
+%%DOCSDIR%%/pl/images/button-print-test-page.gif
+%%DOCSDIR%%/pl/images/button-publish-printer.gif
+%%DOCSDIR%%/pl/images/button-reject-jobs.gif
+%%DOCSDIR%%/pl/images/button-release-job.gif
+%%DOCSDIR%%/pl/images/button-restart-job.gif
+%%DOCSDIR%%/pl/images/button-save-changes.gif
+%%DOCSDIR%%/pl/images/button-search.gif
+%%DOCSDIR%%/pl/images/button-set-allowed-users.gif
+%%DOCSDIR%%/pl/images/button-set-as-default.gif
+%%DOCSDIR%%/pl/images/button-set-printer-options.gif
+%%DOCSDIR%%/pl/images/button-show-active.gif
+%%DOCSDIR%%/pl/images/button-show-all.gif
+%%DOCSDIR%%/pl/images/button-show-completed.gif
+%%DOCSDIR%%/pl/images/button-show-next.gif
+%%DOCSDIR%%/pl/images/button-show-previous.gif
+%%DOCSDIR%%/pl/images/button-sort-ascending.gif
+%%DOCSDIR%%/pl/images/button-sort-descending.gif
+%%DOCSDIR%%/pl/images/button-start-class.gif
+%%DOCSDIR%%/pl/images/button-start-printer.gif
+%%DOCSDIR%%/pl/images/button-stop-class.gif
+%%DOCSDIR%%/pl/images/button-stop-printer.gif
+%%DOCSDIR%%/pl/images/button-unpublish-printer.gif
+%%DOCSDIR%%/pl/images/button-use-default-config.gif
+%%DOCSDIR%%/pl/images/button-view-access-log.gif
+%%DOCSDIR%%/pl/images/button-view-error-log.gif
+%%DOCSDIR%%/pl/images/button-view-page-log.gif
+%%DOCSDIR%%/pl/images/button-view-printable-version.gif
+%%DOCSDIR%%/pl/index.html
+%%DOCSDIR%%/sv/images/button-accept-jobs.gif
+%%DOCSDIR%%/sv/images/button-add-class.gif
+%%DOCSDIR%%/sv/images/button-add-printer.gif
+%%DOCSDIR%%/sv/images/button-add-this-printer.gif
+%%DOCSDIR%%/sv/images/button-cancel-all-jobs.gif
+%%DOCSDIR%%/sv/images/button-cancel-job.gif
+%%DOCSDIR%%/sv/images/button-change-settings.gif
+%%DOCSDIR%%/sv/images/button-clean-print-heads.gif
+%%DOCSDIR%%/sv/images/button-clear.gif
+%%DOCSDIR%%/sv/images/button-continue.gif
+%%DOCSDIR%%/sv/images/button-delete-class.gif
+%%DOCSDIR%%/sv/images/button-delete-printer.gif
+%%DOCSDIR%%/sv/images/button-edit-configuration-file.gif
+%%DOCSDIR%%/sv/images/button-export-samba.gif
+%%DOCSDIR%%/sv/images/button-help.gif
+%%DOCSDIR%%/sv/images/button-hold-job.gif
+%%DOCSDIR%%/sv/images/button-manage-classes.gif
+%%DOCSDIR%%/sv/images/button-manage-jobs.gif
+%%DOCSDIR%%/sv/images/button-manage-printers.gif
+%%DOCSDIR%%/sv/images/button-manage-server.gif
+%%DOCSDIR%%/sv/images/button-modify-class.gif
+%%DOCSDIR%%/sv/images/button-modify-printer.gif
+%%DOCSDIR%%/sv/images/button-move-job.gif
+%%DOCSDIR%%/sv/images/button-move-jobs.gif
+%%DOCSDIR%%/sv/images/button-print-self-test-page.gif
+%%DOCSDIR%%/sv/images/button-print-test-page.gif
+%%DOCSDIR%%/sv/images/button-publish-printer.gif
+%%DOCSDIR%%/sv/images/button-reject-jobs.gif
+%%DOCSDIR%%/sv/images/button-release-job.gif
+%%DOCSDIR%%/sv/images/button-restart-job.gif
+%%DOCSDIR%%/sv/images/button-save-changes.gif
+%%DOCSDIR%%/sv/images/button-search.gif
+%%DOCSDIR%%/sv/images/button-set-allowed-users.gif
+%%DOCSDIR%%/sv/images/button-set-as-default.gif
+%%DOCSDIR%%/sv/images/button-set-printer-options.gif
+%%DOCSDIR%%/sv/images/button-show-active.gif
+%%DOCSDIR%%/sv/images/button-show-all.gif
+%%DOCSDIR%%/sv/images/button-show-completed.gif
+%%DOCSDIR%%/sv/images/button-show-next.gif
+%%DOCSDIR%%/sv/images/button-show-previous.gif
+%%DOCSDIR%%/sv/images/button-sort-ascending.gif
+%%DOCSDIR%%/sv/images/button-sort-descending.gif
+%%DOCSDIR%%/sv/images/button-start-class.gif
+%%DOCSDIR%%/sv/images/button-start-printer.gif
+%%DOCSDIR%%/sv/images/button-stop-class.gif
+%%DOCSDIR%%/sv/images/button-stop-printer.gif
+%%DOCSDIR%%/sv/images/button-unpublish-printer.gif
+%%DOCSDIR%%/sv/images/button-use-default-config.gif
+%%DOCSDIR%%/sv/images/button-view-access-log.gif
+%%DOCSDIR%%/sv/images/button-view-error-log.gif
+%%DOCSDIR%%/sv/images/button-view-page-log.gif
+%%DOCSDIR%%/sv/images/button-view-printable-version.gif
+%%DOCSDIR%%/sv/index.html
+share/locale/de/cups_de.po
 share/locale/es/cups_es.po
 share/locale/ja/cups_ja.po
+share/locale/pl/cups_pl.po
 share/locale/sv/cups_sv.po
 share/cups/banners/classified
 share/cups/banners/confidential
@@ -508,6 +562,68 @@ share/cups/templates/class-jobs-header.tmpl
 share/cups/templates/class-modified.tmpl
 share/cups/templates/classes.tmpl
 share/cups/templates/classes-header.tmpl
+share/cups/templates/de/add-class.tmpl
+share/cups/templates/de/add-printer.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-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-jobs-header.tmpl
+share/cups/templates/de/class-modified.tmpl
+share/cups/templates/de/classes-header.tmpl
+share/cups/templates/de/classes.tmpl
+share/cups/templates/de/edit-config.tmpl
+share/cups/templates/de/error-op.tmpl
+share/cups/templates/de/error.tmpl
+share/cups/templates/de/header.tmpl
+share/cups/templates/de/help-header.tmpl
+share/cups/templates/de/help-printable.tmpl
+share/cups/templates/de/job-cancel.tmpl
+share/cups/templates/de/job-hold.tmpl
+share/cups/templates/de/job-move.tmpl
+share/cups/templates/de/job-moved.tmpl
+share/cups/templates/de/job-release.tmpl
+share/cups/templates/de/job-restart.tmpl
+share/cups/templates/de/jobs-header.tmpl
+share/cups/templates/de/jobs.tmpl
+share/cups/templates/de/maintenance.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/pager.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-default.tmpl
+share/cups/templates/de/printer-deleted.tmpl
+share/cups/templates/de/printer-jobs-header.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-header.tmpl
+share/cups/templates/de/printers.tmpl
+share/cups/templates/de/restart.tmpl
+share/cups/templates/de/samba-export.tmpl
+share/cups/templates/de/samba-exported.tmpl
+share/cups/templates/de/search.tmpl
+share/cups/templates/de/set-printer-options-header.tmpl
+share/cups/templates/de/set-printer-options-trailer.tmpl
+share/cups/templates/de/test-page.tmpl
+share/cups/templates/de/trailer.tmpl
+share/cups/templates/de/users.tmpl
 share/cups/templates/edit-config.tmpl
 share/cups/templates/error.tmpl
 share/cups/templates/error-op.tmpl
@@ -836,27 +952,27 @@ sbin/cupsaddsmb
 sbin/lpadmin
 sbin/lpinfo
 sbin/lpmove
-@dirrmtry share/nls
-@dirrmtry share/locale/sv
-@dirrmtry share/locale/ja
-@dirrmtry share/locale/es
-@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/help
-@dirrm share/doc/cups/es/images
-@dirrm share/doc/cups/es
-@dirrm share/doc/cups
-@dirrmtry share/doc
+@dirrmtry share/locale/pl
+@dirrm %%DOCSDIR%%/sv/images
+@dirrm %%DOCSDIR%%/sv
+@dirrm %%DOCSDIR%%/pl/images
+@dirrm %%DOCSDIR%%/pl
+@dirrm %%DOCSDIR%%/ja/images
+@dirrm %%DOCSDIR%%/ja
+@dirrm %%DOCSDIR%%/images
+@dirrm %%DOCSDIR%%/help
+@dirrm %%DOCSDIR%%/es/images
+@dirrm %%DOCSDIR%%/es
+@dirrm %%DOCSDIR%%/de/images
+@dirrm %%DOCSDIR%%/de
+@dirrm %%DOCSDIR%%
 @dirrm share/cups/templates/sv
 @dirrm share/cups/templates/pl
 @dirrm share/cups/templates/ja
 @dirrm share/cups/templates/es
+@dirrm share/cups/templates/de
 @dirrm share/cups/templates
+@exec  mkdir -p share/cups/profiles
 @dirrm share/cups/profiles
 @dirrm share/cups/model
 @dirrm share/cups/fonts
@@ -868,12 +984,15 @@ sbin/lpmove
 @dirrm libexec/cups/notifier
 @dirrm libexec/cups/monitor
 @dirrm libexec/cups/filter
+@exec mkdir -p libexec/cups/driver
 @dirrm libexec/cups/driver
 @dirrm libexec/cups/daemon
 @dirrm libexec/cups/cgi-bin
 @dirrm libexec/cups/backend
 @dirrm libexec/cups
+%%PHP%%@dirrmtry lib/php/%%PHP_EXT_DIR%%
 @dirrm include/cups
-@dirrmtry etc/cups/ppd
 @dirrmtry etc/cups/interfaces
+@dirrmtry etc/cups/ppd
+@dirrmtry etc/cups/ssl
 @dirrmtry etc/cups